Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into atlas
Browse files Browse the repository at this point in the history
  • Loading branch information
Hugo Mercier committed Oct 5, 2012
2 parents e3536e4 + eae523d commit 77761b0
Show file tree
Hide file tree
Showing 425 changed files with 432,772 additions and 172,894 deletions.