Skip to content

Commit b4b779c

Browse files
author
Emilio Loi
committedApr 22, 2013
Merge branch 'master' of git://github.com/qgis/Quantum-GIS into styles_to_db
Conflicts: src/ui/qgsvectorlayerpropertiesbase.ui
·
ltr-3_40archive/master_2
2 parents ea382d1 + 1a91841 commit b4b779c

File tree

1,323 files changed

+758089
-395413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,323 files changed

+758089
-395413
lines changed
 

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ doc/INSTALL.tex
4141
scripts/Debug
4242
scripts/RelWithDebInfo
4343
/CMakeLists.txt.user
44+
/CMakeLists.txt.user.*
4445
qgis-test.ctest
4546
i18n/*.qm
4647
.project

‎cmake_templates/Doxyfile.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,6 @@ INPUT = @CMAKE_SOURCE_DIR@/doc \
596596
@CMAKE_SOURCE_DIR@/src/core \
597597
@CMAKE_SOURCE_DIR@/src/core/composer \
598598
@CMAKE_SOURCE_DIR@/src/core/raster \
599-
@CMAKE_SOURCE_DIR@/src/core/renderer \
600-
@CMAKE_SOURCE_DIR@/src/core/symbology \
601599
@CMAKE_SOURCE_DIR@/src/core/symbology-ng \
602600
@CMAKE_SOURCE_DIR@/src/core/gps \
603601
@CMAKE_SOURCE_DIR@/src/gui \

0 commit comments

Comments
 (0)