[urdfdom] 03/04: 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 master
in repository urdfdom.

commit 47c4ed76676a137e8ed78f5851bb58f327f64a7c
Merge: 07b8be5 66c1b58
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Thu Jan 9 16:00:41 2014 +0000

    Merge branch 'upstream' into dfsg_clean

 CMakeLists.txt                                |  5 ++++-
 urdf_parser/CMakeLists.txt                    |  8 ++++----
 urdf_parser/include/urdf_parser/urdf_parser.h |  1 +
 urdf_parser/src/link.cpp                      |  8 ++++----
 urdf_parser/src/model.cpp                     | 22 ++++++++++++++++++++++
 xsd/urdf.xsd                                  |  4 ++--
 6 files changed, 37 insertions(+), 11 deletions(-)

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