Skip to content

Commit

Permalink
Merge branch 'release-1_7' of github.com:qgis/Quantum-GIS into releas…
Browse files Browse the repository at this point in the history 
…e-1_7
  • Loading branch information
@timlinux
timlinux committed Nov 21, 2011
2 parents d0cf9df + 4c894d9 commit d00fc4a
Show file tree
Hide file tree
Showing 1,001 changed files with 4,517 additions and 3,418 deletions.