[sumo] 02/05: Merge tag 'upstream/0.18.0+repack+dfsg'

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository sumo.

commit 5876c81e9a087f63444eafa2b2d65c97ecde5a1d
Merge: 4da44c5 7870538
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Nov 18 19:28:46 2013 +0100

    Merge tag 'upstream/0.18.0+repack+dfsg'
    
    Upstream version 0.18.0+repack+dfsg

 src/foreign/eulerspiral/BiArc.cpp                  |  200 ++++++++
 src/foreign/eulerspiral/BiArc.h                    |  203 ++++++++
 src/foreign/eulerspiral/Makefile.am                |    5 +
 src/foreign/eulerspiral/Makefile.in                |  505 ++++++++++++++++++++
 src/foreign/eulerspiral/angles.h                   |   69 +++
 src/foreign/eulerspiral/euler.cpp                  |  475 ++++++++++++++++++
 src/foreign/eulerspiral/euler.h                    |  213 +++++++++
 src/foreign/eulerspiral/points.h                   |  256 ++++++++++
 .../calibration/cadytsSumoController.jar           |  Bin 326664 -> 0 bytes
 .../contributed/sumoplayer/lib/javaproj-1.0.4.jar  |  Bin 253045 -> 0 bytes
 tools/contributed/sumoplayer/lib/xerces_2_5_0.jar  |  Bin 934835 -> 0 bytes
 tools/contributed/traci4j/lib/junit.jar            |  Bin 222584 -> 0 bytes
 tools/contributed/traci4j/lib/log4j.jar            |  Bin 350677 -> 0 bytes
 .../org.hamcrest.core_1.1.0.v20090501071000.jar    |  Bin 27828 -> 0 bytes
 tools/contributed/traci4j/lib/xercesImpl.jar       |  Bin 1223877 -> 0 bytes
 .../trafficmodeler/jar/SUMOTrafficModeler.jar      |  Bin 834386 -> 0 bytes
 tools/contributed/trafficmodeler/lib/colt.jar      |  Bin 581945 -> 0 bytes
 tools/traceExporter/libs/stax-1.2.0.jar            |  Bin 179346 -> 0 bytes
 tools/traceExporter/libs/stax-api-1.0.jar          |  Bin 25863 -> 0 bytes
 tools/traceExporter/traceExporter.jar              |  Bin 54729 -> 0 bytes
 20 files changed, 1926 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sumo.git