[sdformat/epel7: 12/12] Merge branch 'master' into epel7

[rmattes]

commit 31cb02945e9ac1823c367ed600ce4d8c535b470a
Merge: 2be7fea 0512b9e
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sun Sep 28 16:23:15 2014 -0400

    Merge branch 'master' into epel7

 .gitignore                    |    2 +
 sdformat-1.4.10-urdfdom.patch |   68 -------
 sdformat-2.0.0-urdf3.patch    |  299 +++++++++++++++++++++++++++
 sdformat-2.0.0-urdfdom.patch  |   27 +++
 sdformat-2.0.1-urdf3.patch    |  443 +++++++++++++++++++++++++++++++++++++++++
 sdformat-2.0.1-urdfdom.patch  |   44 ++++
 sdformat.spec                 |   54 ++++-
 sources                       |    2 +-
 8 files changed, 861 insertions(+), 78 deletions(-)
---