DennisOSRM 7baef59b79 Merge remote-tracking branch 'origin/develop/GraphEdgeSeparation' into ...

develop/GraphEdgeSeparation

Conflicts:
	Contractor/EdgeBasedGraphFactory.cpp

2012-04-25 19:01:58 +02:00

..

ContractionCleanup.h

Removing leftovers of STL parallel mode experiments

2012-04-14 18:01:06 +02:00

Contractor.h

Externalized temporary storage for edge-expanded graph

2012-04-25 16:07:43 +02:00

EdgeBasedGraphFactory.cpp

Merge remote-tracking branch 'origin/develop/GraphEdgeSeparation' into

2012-04-25 19:01:58 +02:00

EdgeBasedGraphFactory.h

Undoing wrong merge. Flushing some memory before generation of

2012-04-25 18:56:42 +02:00