summaryrefslogtreecommitdiffstats
path: root/src/device-manager.cpp
diff options
context:
space:
mode:
authorAdrian Boguszewski <adrbogus1@student.pg.gda.pl>2016-08-03 14:56:48 +0000
committerAdrian Boguszewski <adrbogus1@student.pg.gda.pl>2016-08-03 14:56:48 +0000
commit2d71db83e3fe52505116fecf024f79a9777d4ee1 (patch)
tree07b5e7b87af9ea1ba6bedd8b39fd96b0a13944c7 /src/device-manager.cpp
parentRenamed some functions, fixed tests (diff)
parentRemoved unused includes, decreased compilation time. Once again (diff)
downloadinkscape-2d71db83e3fe52505116fecf024f79a9777d4ee1.tar.gz
inkscape-2d71db83e3fe52505116fecf024f79a9777d4ee1.zip
Merged trunk
(bzr r14954.1.29)
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