diff options
| author | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-08-04 06:19:46 +0000 |
|---|---|---|
| committer | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-08-04 06:19:46 +0000 |
| commit | e0728cfe3dcf882045af5295ffd7c2725b6a430f (patch) | |
| tree | 3289217df16f6f73a2950cd3d40d24a9c856cae1 /src/desktop.cpp | |
| parent | Add functionality to add and delete CSS property in CSS panel (diff) | |
| parent | Add legacy verb SP_VERB_SELECTION_OUTLINE_LEGACY as pointed in bug 1556592#14 (diff) | |
| download | inkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.tar.gz inkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.zip | |
Merge changes from trunk
(bzr r14949.1.62)
Diffstat (limited to 'src/desktop.cpp')
| -rw-r--r-- | src/desktop.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index d482d0d7f..7e0953d4d 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -23,12 +23,11 @@ #ifdef HAVE_CONFIG_H -# include "config.h" +#include <config.h> #endif #include "ui/dialog/dialog-manager.h" #include <glibmm/i18n.h> -#include <sigc++/functors/mem_fun.h> #include <2geom/transforms.h> #include <2geom/rect.h> @@ -45,35 +44,24 @@ #include "display/canvas-temporary-item-list.h" #include "display/drawing-group.h" #include "display/gnome-canvas-acetate.h" -#include "display/drawing.h" #include "display/snap-indicator.h" #include "display/sodipodi-ctrlrect.h" #include "display/sp-canvas-group.h" -#include "display/sp-canvas.h" #include "display/sp-canvas-util.h" -#include "document.h" #include "document-undo.h" #include "event-log.h" #include "helper/action-context.h" #include "ui/interface.h" #include "layer-fns.h" #include "layer-manager.h" -#include "layer-model.h" -#include "macros.h" #include "message-context.h" #include "message-stack.h" -#include "preferences.h" #include "resource-manager.h" #include "ui/tools/select-tool.h" -#include "selection.h" -#include "sp-item-group.h" -#include "sp-item-group.h" #include "sp-namedview.h" #include "sp-root.h" -#include "sp-defs.h" #include "ui/tool-factory.h" #include "widgets/desktop-widget.h" -#include "xml/repr.h" #include "helper/action.h" //sp_action_perform // TODO those includes are only for node tool quick zoom. Remove them after fixing it. |