diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-03-05 21:59:02 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-03-05 21:59:02 +0000 |
| commit | 58d7a0e0ef39488839985440c6f87a78d112e15f (patch) | |
| tree | bb4b02b5a787701ee489b2748450ed594548c584 /src/file.cpp | |
| parent | BPower for testing. (diff) | |
| parent | Added null check (should fix Bug #1051017 ) (diff) | |
| download | inkscape-58d7a0e0ef39488839985440c6f87a78d112e15f.tar.gz inkscape-58d7a0e0ef39488839985440c6f87a78d112e15f.zip | |
merge from trunk
(bzr r11950.1.46)
Diffstat (limited to 'src/file.cpp')
| -rw-r--r-- | src/file.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/file.cpp b/src/file.cpp index 468d02eba..97087c1a1 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -81,10 +81,6 @@ using Inkscape::DocumentUndo; #include "extension/dbus/dbus-init.h" #endif -//#ifdef WITH_INKBOARD -//#include "jabber_whiteboard/session-manager.h" -//#endif - #ifdef WIN32 #include <windows.h> #endif |