Merge remote branch 'pb/master'

qgis · Dec 13, 2011 · 1f0341c · 1f0341c
2 parents 8bdf404 + 3f14ea8
commit 1f0341c
Show file tree

Hide file tree

Showing 315 changed files with 117,674 additions and 23,410 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,4 @@ doc/CODING.tex
 doc/INSTALL.tex
 scripts/Debug
 scripts/RelWithDebInfo
+/CMakeLists.txt.user