Skip to content

Commit 5df9bc3

Browse files
committedOct 12, 2012
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
2 parents 0e2f92f + 036d844 commit 5df9bc3

File tree

1,125 files changed

+453152
-180117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,125 files changed

+453152
-180117
lines changed
 

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.sip export-subst

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@ scripts/RelWithDebInfo
4444
qgis-test.ctest
4545
i18n/*.qm
4646
.project
47+
.idea

0 commit comments

Comments
 (0)