Skip to content

Commit a1d43e6

Browse files
committedJul 2, 2013
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into make_pull_req_from_ja
Conflicts: i18n/qgis_ja.ts
2 parents 03c1cec + ce1a9a8 commit a1d43e6

Some content is hidden

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

68 files changed

+92094
-82887
lines changed
 

‎doc/TRANSLATORS

Lines changed: 26 additions & 26 deletions
Large diffs are not rendered by default.

‎i18n/qgis_af.ts

Lines changed: 1936 additions & 1829 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)