merged from master

This commit is contained in:
jdescottes
2013-11-01 23:37:09 +01:00
22 changed files with 604 additions and 61 deletions

View File

@ -15,7 +15,9 @@ exports.scripts = [
"js/utils/core.js",
"js/utils/CanvasUtils.js",
"js/utils/Math.js",
"js/utils/FileUtils.js",
"js/utils/FrameUtils.js",
"js/utils/ImageResizer.js",
"js/utils/PixelUtils.js",
"js/utils/Serializer.js",
"js/utils/Template.js",
@ -55,9 +57,13 @@ exports.scripts = [
"js/controller/ToolController.js",
"js/controller/PaletteController.js",
"js/controller/NotificationController.js",
// Settings sub-controllers
"js/controller/settings/ApplicationSettingsController.js",
"js/controller/settings/GifExportController.js",
"js/controller/SettingsController.js",
"js/controller/settings/ImportController.js",
// Settings controller
"js/controller/settings/SettingsController.js",
// Services
"js/service/LocalStorageService.js",