/ QGIS Public
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote branch 'pb/master' into network-analysis
Conflicts: src/analysis/network/qgsdistanceedgeproperter.cpp src/analysis/network/qgsgraphbuilder.h src/plugins/roadgraph/graphbuilder.h src/plugins/roadgraph/linevectorlayerdirector.cpp src/plugins/roadgraph/roadgraphplugin.cpp src/plugins/roadgraph/shortestpathwidget.cpp src/plugins/roadgraph/simplegraphbuilder.cpp
- Loading branch information
Showing 641 changed files with 7,897 additions and 5,813 deletions.