summaryrefslogtreecommitdiffstats
path: root/src/dom
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-07-06 01:59:32 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2011-07-06 01:59:32 +0000
commite65a02ed32b78534739aba24929ece7c44dd967f (patch)
tree13cf022f18f6b5bae46aad4bc339e512f069a514 /src/dom
parentPull 2Geom revision 2013 (extra constructors for Rect). (diff)
parentText edit dialog: Apply button should grab default only after adding to window (diff)
downloadinkscape-e65a02ed32b78534739aba24929ece7c44dd967f.tar.gz
inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.zip
Merge from trunk
(bzr r10347.1.5)
Diffstat (limited to 'src/dom')
-rw-r--r--src/dom/CMakeLists.txt3
-rw-r--r--src/dom/mingwenv.bat4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/dom/CMakeLists.txt b/src/dom/CMakeLists.txt
index b328418c7..df2411b13 100644
--- a/src/dom/CMakeLists.txt
+++ b/src/dom/CMakeLists.txt
@@ -32,6 +32,7 @@ set(dom_SRC
util/thread.cpp
util/ziptool.cpp
+
# -------
# Headers
css.h
@@ -69,8 +70,6 @@ set(dom_SRC
io/bufferstream.h
io/domstream.h
io/gzipstream.h
- io/httpclient.h
- io/socket.h
io/stringstream.h
io/uristream.h
diff --git a/src/dom/mingwenv.bat b/src/dom/mingwenv.bat
index 996566e7b..48e8bf096 100644
--- a/src/dom/mingwenv.bat
+++ b/src/dom/mingwenv.bat
@@ -1,2 +1,2 @@
-set PATH=c:\mingw\bin;%PATH%
-set RM=del
+set PATH=c:\mingw\bin;%PATH%
+set RM=del