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
  • Loading branch information
Sergey Yakushev committed Jan 14, 2012
2 parents 1f0341c + 8930633 commit aa323ae
Show file tree
Hide file tree
Showing 315 changed files with 46,383 additions and 33,833 deletions.
18 changes: 13 additions & 5 deletions CMakeLists.txt