Skip to content
Permalink
Browse files

Merge branch 'master' into delimiter_text_enhancement

  • Loading branch information
ccrook committed Apr 13, 2013
2 parents d124732 + d87eb2a commit 1abb42f010b8a73bdd0a8515f0d48a16665ed345
Showing 364 changed files with 683,795 additions and 380,576 deletions.
@@ -41,6 +41,7 @@ doc/INSTALL.tex
scripts/Debug
scripts/RelWithDebInfo
/CMakeLists.txt.user
/CMakeLists.txt.user.*
qgis-test.ctest
i18n/*.qm
.project
@@ -596,8 +596,6 @@ INPUT = @CMAKE_SOURCE_DIR@/doc \
@CMAKE_SOURCE_DIR@/src/core \
@CMAKE_SOURCE_DIR@/src/core/composer \
@CMAKE_SOURCE_DIR@/src/core/raster \
@CMAKE_SOURCE_DIR@/src/core/renderer \
@CMAKE_SOURCE_DIR@/src/core/symbology \
@CMAKE_SOURCE_DIR@/src/core/symbology-ng \
@CMAKE_SOURCE_DIR@/src/core/gps \
@CMAKE_SOURCE_DIR@/src/gui \
@@ -50,3 +50,4 @@ Etienne Tourigny <etourigny.dev at gmail.com>
Larry Shaffer <larrys at dakotacarto.com>
Victor Olaya <volayaf at gmail.com>
Dave DeHaan <dave.dehaan@sap.com>
Matthias Kuhn <matthias.kuhn at gmx.ch

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

0 comments on commit 1abb42f

Please sign in to comment.
You can’t perform that action at this time.