piskel/src/js/controller/dialogs
jdescottes 8a29b78af8 Merge branch 'master' into enhancement-palette-sorting
Conflicts:
	src/js/utils/FrameUtils.js
2014-09-21 21:56:22 +02:00
..
AbstractDialogController.js Moved image import to worker 2014-09-20 09:14:21 +02:00
BrowseLocalController.js cleanup 2014-07-13 00:21:36 +02:00
CreatePaletteController.js Moved image import to worker 2014-09-20 09:14:21 +02:00
DialogsController.js Palette creator can save palettes to local storage 2014-09-06 12:37:11 +02:00
ImportImageController.js Merge branch 'master' into enhancement-palette-sorting 2014-09-21 21:56:22 +02:00