Skip to content

Commit

Permalink
Merge branch 'master' of github.com:qgis/QGIS
Browse files Browse the repository at this point in the history
  • Loading branch information
rouault committed Jun 11, 2016
2 parents edace8d + 7040ad4 commit 5839a3a
Show file tree
Hide file tree
Showing 550 changed files with 12,520 additions and 2,901 deletions.