jdescottes 8a29b78af8 Merge branch 'master' into enhancement-palette-sorting ...

Conflicts:
	src/js/utils/FrameUtils.js

2014-09-21 21:56:22 +02:00

..

frame

Simplified lighten + fixed frame caching bug

2014-07-13 21:01:50 +02:00

piskel

Cleanup project root

2014-03-16 21:15:34 +01:00

Frame.js

Final fixes before new version

2014-07-15 00:31:24 +02:00

Layer.js

added FrameUtils unit tests

2014-09-21 21:39:54 +02:00

Palette.js

Split CreatePaletteControllers in ctrl + widget for colors list

2014-09-18 07:59:56 +02:00

Piskel.js

Merge branch 'master' into enhancement-palette-sorting

2014-09-21 21:56:22 +02:00