Skip to content

Commit

Permalink
Merge remote branch 'pb/master' into network-analysis
Browse files Browse the repository at this point in the history
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
stopa85milk committed May 31, 2011
2 parents 9ab859a + c8dd587 commit 2670900
Show file tree
Hide file tree
Showing 641 changed files with 7,897 additions and 5,813 deletions.