summaryrefslogtreecommitdiffstats
path: root/src/widgets/paint-selector.cpp
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2015-04-29 20:51:23 +0000
committerMarc Jeanmougin <mc@M0nst3r.bouyguesbox.fr>2015-04-29 20:51:23 +0000
commit5163b1155c85c040b55f28c771f6d12bcd483765 (patch)
tree79afe1546f86f49fe1dc8fd625e125c0646bc59b /src/widgets/paint-selector.cpp
parentmerge with trunk (diff)
parentBetter solution picking (diff)
downloadinkscape-5163b1155c85c040b55f28c771f6d12bcd483765.tar.gz
inkscape-5163b1155c85c040b55f28c771f6d12bcd483765.zip
updated with trunk
(bzr r13922.1.19)
Diffstat (limited to 'src/widgets/paint-selector.cpp')
-rw-r--r--src/widgets/paint-selector.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 948c80db3..740ce2b0e 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -24,10 +24,6 @@
#include <cstring>
#include <string>
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
#include "widgets/swatch-selector.h"
#include "sp-pattern.h"
#include <glibmm/i18n.h>