projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into genete_core_review
[synfig.git]
/
synfig-studio
/
src
/
gui
/
modules
/
mod_palette
/
mod_palette.cpp
diff --git
a/synfig-studio/src/gui/modules/mod_palette/mod_palette.cpp
b/synfig-studio/src/gui/modules/mod_palette/mod_palette.cpp
index
80580be
..
ff1c57a
100644
(file)
--- a/
synfig-studio/src/gui/modules/mod_palette/mod_palette.cpp
+++ b/
synfig-studio/src/gui/modules/mod_palette/mod_palette.cpp
@@
-34,7
+34,7
@@
#include "dock_palbrowse.h"
#include "../../app.h"
-#include "../../dockmanager.h"
+#include "../../dock
s/dock
manager.h"
#include "../../general.h"