Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · Jun 10, 2011 · 08a425c · 08a425c
2 parents 82e9936 + 1b15528
commit 08a425c
Show file tree

Hide file tree

Showing 25 changed files with 1,017 additions and 179 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -20,6 +20,7 @@ SET(QGIS_APP_SRCS
   qgscustomprojectiondialog.cpp
   qgsdbfilterproxymodel.cpp
   qgsdbtablemodel.cpp
+  qgsembedlayerdialog.cpp
   qgsformannotationdialog.cpp
   qgsdelattrdialog.cpp
   qgsdisplayangle.cpp
@@ -152,6 +153,7 @@ SET (QGIS_APP_MOC_HDRS
   qgsdbtablemodel.h
   qgsdelattrdialog.h
   qgsdisplayangle.h
+  qgsembedlayerdialog.h
   qgsfeatureaction.h
   qgsfieldcalculator.h
   qgsformannotationdialog.h