summaryrefslogtreecommitdiffstats
path: root/src/ui/Makefile_insert
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2010-01-14 08:13:09 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2010-01-14 08:13:09 +0000
commit7f7da4643d6909af5cd58b2f24846774e3af509b (patch)
tree1fec13b3616ecc90fb251bb9e643aefc43c80c43 /src/ui/Makefile_insert
parentSome additional docs (diff)
parentInitial cut of disabling floating windows on window managers with problems. (diff)
downloadinkscape-7f7da4643d6909af5cd58b2f24846774e3af509b.tar.gz
inkscape-7f7da4643d6909af5cd58b2f24846774e3af509b.zip
* Merge from trunk
* Update to new snapping API * Modify the join action slightly (bzr r8846.2.11)
Diffstat (limited to 'src/ui/Makefile_insert')
-rw-r--r--src/ui/Makefile_insert4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ui/Makefile_insert b/src/ui/Makefile_insert
index 3eb6c6b13..eb8966d11 100644
--- a/src/ui/Makefile_insert
+++ b/src/ui/Makefile_insert
@@ -9,4 +9,6 @@ ink_common_sources += \
ui/previewable.h \
ui/previewfillable.h \
ui/previewholder.cpp \
- ui/previewholder.h
+ ui/previewholder.h \
+ ui/uxmanager.cpp \
+ ui/uxmanager.h