Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/qgis/Quantum-GIS
Browse files Browse the repository at this point in the history 
Conflicts:
	src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  • Loading branch information
Hugo Mercier committed Jul 25, 2012
2 parents f2c4f53 + d039c3f commit 6af929a
Show file tree
Hide file tree
Showing 602 changed files with 123,223 additions and 82,069 deletions.