Skip to content

Commit

Permalink
Merge remote branch 'upstream/master' into expression-labels
Browse files Browse the repository at this point in the history
Conflicts:
	src/core/qgspallabeling.cpp
	src/gui/CMakeLists.txt
	src/ui/qgslabelingguibase.ui
  • Loading branch information
NathanW2 committed Aug 8, 2011
2 parents 7454584 + 2034d59 commit fc0423e
Show file tree
Hide file tree
Showing 446 changed files with 53,219 additions and 7,071 deletions.