Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/qgis/Quantum-GIS into atlas
Browse files Browse the repository at this point in the history 
Conflicts:
	python/core/qgsexpression.sip

Add a missing function to QgsExpression
  • Loading branch information
Hugo Mercier committed Sep 26, 2012
2 parents 4657c84 + ee593e8 commit ff41bec
Show file tree
Hide file tree
Showing 576 changed files with 23,722 additions and 10,041 deletions.