[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 3b2c89d700551f11ecd1cc26efe9c4e7d7b1efd4
Merge: 47c4ed7 b53faeb
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Mar 24 19:46:16 2014 +0000

    Merge branch 'upstream' into dfsg_clean

 CMakeLists.txt                                     |    4 +-
 README.md                                          |   36 +
 README.txt                                         |    7 -
 urdf_parser/CMakeLists.txt                         |    8 +-
 urdf_parser/src/joint.cpp                          |   28 +-
 urdf_parser/src/link.cpp                           |   46 +-
 urdf_parser/src/model.cpp                          |   18 +-
 urdf_parser_py/scripts/display_urdf                |    2 +-
 urdf_parser_py/src/urdf_parser_py/urdf.py          |   35 +-
 .../src/urdf_parser_py/xml_reflection/basics.py    |   16 +-
 .../src/urdf_parser_py/xml_reflection/core.py      |   45 +-
 urdf_parser_py/test/calvin/calvin.urdf             | 1286 ++++++++++++++++
 urdf_parser_py/test/calvin/gen.patch               | 1422 ++++++++++++++++++
 urdf_parser_py/test/{romeo => calvin}/test.sh      |   11 +-
 urdf_parser_py/test/romeo/romeo.urdf               | 1585 ++++++++++++++++++++
 urdf_parser_py/test/romeo/test.sh                  |    7 +-
 urdf_parser_py/test/transmission/gen.patch         |   24 +
 urdf_parser_py/test/transmission/test.py           |   19 +
 urdf_parser_py/test/transmission/test.urdf         |   22 +
 19 files changed, 4524 insertions(+), 97 deletions(-)

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