Merge remote-tracking branch 'origin/Integrate-SelectedColorsService' into Integrate-SelectedColorsService

Browse Source

Conflicts:
	src/js/controller/DrawingController.js
	src/js/tools/drawing/DitheringTool.js

...

This commit is contained in:

grosbouddha 2015-09-16 23:03:57 +02:00

parent e9c99a241f a0350ff2e8

commit 8d618fc31c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available