Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
Browse files Browse the repository at this point in the history 
Conflicts:
	src/core/composer/qgsatlascomposition.cpp
  • Loading branch information
Hugo Mercier committed Dec 11, 2012
2 parents 6e8bf84 + dcf3ede commit d584b76
Show file tree
Hide file tree
Showing 1,631 changed files with 149,790 additions and 75,123 deletions.