1. 14 Oct, 2015 1 commit
  2. 13 Oct, 2015 2 commits
  3. 12 Oct, 2015 9 commits
  4. 11 Oct, 2015 14 commits
  5. 10 Oct, 2015 2 commits
  6. 09 Oct, 2015 8 commits
  7. 08 Oct, 2015 4 commits
    • Dmitry Kazakov's avatar
      Merge remote-tracking branch 'origin/krita-next' into krita-animation-kf5-kazakov · bef4471d
      Dmitry Kazakov authored
      Conflicts:
      	krita/plugins/tools/defaulttools/tests/CMakeLists.txt
      	krita/ui/CMakeLists.txt
      	krita/ui/tests/CMakeLists.txt
      bef4471d
    • Dmitry Kazakov's avatar
      Fix compilation · c47c7903
      Dmitry Kazakov authored
      c47c7903
    • Dmitry Kazakov's avatar
      Merge commit 'da345aaa7b24425d85c4d895' into krita-animation-kf5-kazakov · c962f051
      Dmitry Kazakov authored
      Conflicts:
      	krita/image/kis_default_bounds.cpp
      	krita/image/kis_dom_utils.cpp
      	krita/image/kis_image.h
      	krita/image/kis_image_config.cpp
      	krita/image/kis_node.h
      	krita/image/kis_node_graph_listener.cpp
      	krita/image/kis_strokes_queue.h
      	krita/image/kis_updater_context.h
      	krita/image/tests/CMakeLists.txt
      	krita/image/tests/kis_paint_device_test.cpp
      	krita/image/tests/kis_strokes_queue_test.cpp
      	krita/image/tests/kis_transaction_test.cpp
      	krita/libbrush/kis_auto_brush.cpp
      	krita/plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
      	krita/plugins/paintops/libpaintop/kis_texture_option.cpp
      	krita/plugins/tools/defaulttools/strokes/move_stroke_strategy.h
      	krita/plugins/tools/defaulttools/tests/CMakeLists.txt
      	krita/ui/kis_paintop_option.h
      	krita/ui/opengl/kis_opengl_canvas2.cpp
      	krita/ui/tests/CMakeLists.txt
      	krita/ui/tests/freehand_stroke_test.cpp
      	krita/ui/tests/kis_kra_saver_test.cpp
      c962f051
    • Dmitry Kazakov's avatar
      Fix compilation after merge · 0bf0e5d2
      Dmitry Kazakov authored
      0bf0e5d2