summaryrefslogtreecommitdiffstats
path: root/src/inkview.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/inkview.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/inkview.cpp')
-rw-r--r--src/inkview.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/inkview.cpp b/src/inkview.cpp
index db4b1aeb0..b377a3bd0 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -35,7 +35,6 @@
#include <locale.h>
#include <gtkmm/main.h>
-#include <glib.h>
// #include <stropts.h>
@@ -58,8 +57,6 @@
#include "inkscape.h"
-#include <iostream>
-
#ifndef HAVE_BIND_TEXTDOMAIN_CODESET
#define bind_textdomain_codeset(p,c)
#endif