[urdfdom] 01/02: Merge branch 'upstream' into dfsg_clean

[Jose Luis Rivero]

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

jrivero-guest pushed a commit to branch dfsg_clean
in repository urdfdom.

commit 15245a02d204ee04107c48e818108b2793f84bf1
Merge: 5fb4072 ce6319a
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed Dec 4 01:06:34 2013 +0000

    Merge branch 'upstream' into dfsg_clean

 .gitignore                                         |    3 +
 .travis.yml                                        |   11 +
 .travis/build                                      |   45 +
 CMakeLists.txt                                     |   28 +-
 cmake/urdfdom-config.cmake.in                      |    2 +-
 urdf_parser/CMakeLists.txt                         |   17 +-
 urdf_parser/include/urdf_parser/exportdecl.h       |   84 +
 urdf_parser/include/urdf_parser/urdf_parser.h      |   20 +-
 urdf_parser_py/.gitignore                          |    1 +
 urdf_parser_py/CMakeLists.txt                      |    7 +
 urdf_parser_py/README.md                           |   46 +
 urdf_parser_py/scripts/display_urdf                |   21 +
 urdf_parser_py/setup.py                            |   16 +
 urdf_parser_py/src/urdf_parser_py/__init__.py      |    0
 urdf_parser_py/src/urdf_parser_py/sdf.py           |  121 ++
 urdf_parser_py/src/urdf_parser_py/urdf.py          |  436 ++++
 .../src/urdf_parser_py/xml_reflection/__init__.py  |    1 +
 .../src/urdf_parser_py/xml_reflection/basics.py    |   75 +
 .../src/urdf_parser_py/xml_reflection/core.py      |  518 +++++
 urdf_parser_py/test/romeo/gen.patch                | 2114 ++++++++++++++++++++
 urdf_parser_py/test/romeo/test.sh                  |    9 +
 21 files changed, 3553 insertions(+), 22 deletions(-)

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