-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
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.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,3 +34,6 @@ scripts/astyle.exe | |
*.out | ||
*.tex | ||
*.toc | ||
doc/CODING.html | ||
doc/CODING.tex | ||
doc/INSTALL.tex |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.