summaryrefslogtreecommitdiffstats
path: root/src/device-manager.cpp
diff options
context:
space:
mode:
authorkamalpreetgrewal <grewalkamal005@gmail.com>2016-08-04 06:19:46 +0000
committerkamalpreetgrewal <grewalkamal005@gmail.com>2016-08-04 06:19:46 +0000
commite0728cfe3dcf882045af5295ffd7c2725b6a430f (patch)
tree3289217df16f6f73a2950cd3d40d24a9c856cae1 /src/device-manager.cpp
parentAdd functionality to add and delete CSS property in CSS panel (diff)
parentAdd legacy verb SP_VERB_SELECTION_OUTLINE_LEGACY as pointed in bug 1556592#14 (diff)
downloadinkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.tar.gz
inkscape-e0728cfe3dcf882045af5295ffd7c2725b6a430f.zip
Merge changes from trunk
(bzr r14949.1.62)
Diffstat (limited to 'src/device-manager.cpp')
-rw-r--r--src/device-manager.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/device-manager.cpp b/src/device-manager.cpp
index aa3874da8..cfb8291a0 100644
--- a/src/device-manager.cpp
+++ b/src/device-manager.cpp
@@ -8,19 +8,17 @@
*/
#include "device-manager.h"
-#include <map>
#include <set>
#include "preferences.h"
#include <gdkmm/display.h>
#include <gtkmm/accelkey.h>
+#include <glibmm/regex.h>
#if WITH_GTKMM_3_0
# include <gdkmm/devicemanager.h>
#endif
-#include <glibmm/regex.h>
-
#include <gtk/gtk.h>
#define noDEBUG_VERBOSE 1