Skip to content

Commit

Permalink
Merge branch 'master' of github.com:qgis/Quantum-GIS
Browse files Browse the repository at this point in the history
  • Loading branch information
timlinux committed Jun 10, 2011
2 parents 82e9936 + 1b15528 commit 08a425c
Show file tree
Hide file tree
Showing 25 changed files with 1,017 additions and 179 deletions.
2 changes: 2 additions & 0 deletions src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ SET(QGIS_APP_SRCS
qgscustomprojectiondialog.cpp
qgsdbfilterproxymodel.cpp
qgsdbtablemodel.cpp
qgsembedlayerdialog.cpp
qgsformannotationdialog.cpp
qgsdelattrdialog.cpp
qgsdisplayangle.cpp
Expand Down Expand Up @@ -152,6 +153,7 @@ SET (QGIS_APP_MOC_HDRS
qgsdbtablemodel.h
qgsdelattrdialog.h
qgsdisplayangle.h
qgsembedlayerdialog.h
qgsfeatureaction.h
qgsfieldcalculator.h
qgsformannotationdialog.h
Expand Down
Loading

0 comments on commit 08a425c

Please sign in to comment.