/ QGIS Public
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse the repository at this point in the history
Merge remote branch 'upstream/master' into expression-labels
Conflicts: src/core/qgspallabeling.cpp src/gui/CMakeLists.txt src/ui/qgslabelingguibase.ui
- Loading branch information
Showing 446 changed files with 53,219 additions and 7,071 deletions.