Commit 1dfcf53

Emilio Loi

committed

Merge branch 'master' of https://github.com/qgis/Quantum-GIS into styles_to_db

2 parents 02c9264 + ae7115f commit 1dfcf53Copy full SHA for 1dfcf53

3 files changed

+522

-511

lines changed

i18n
- qgis_fr.ts
python/console
- console_output.py
src/mapserver
- qgsprojectparser.cpp

3 files changed

+522

-511

lines changed

Comments

(0)