merge with default

This commit is contained in:
Steve Peters 2013-04-19 13:56:49 -07:00
commit 5fb0b3ea46
6 changed files with 6 additions and 6 deletions

View File

@ -4,7 +4,7 @@
<name>House 1</name>
<version>1.0</version>
<sdf version="1.3">model-1_3.sdf</sdf>
<sdf version="1.4">model-1_4.sdf</sdf>
<sdf version="1.4">model.sdf</sdf>
<author>
<name>Cole Biesemeyer</name>

View File

@ -17,7 +17,7 @@
<inertial>
<mass>33.855</mass>
<pose>-0.0856132 -0.000839955 0.238145</pose>
<pose>-0.0856132 -0.000839955 0.238145 0 0 0</pose>
<inertia>
<ixx>2.2343</ixx>
<ixy>-0.023642</ixy>

View File

@ -17,7 +17,7 @@
<inertial>
<mass>33.855</mass>
<pose>-0.0856132 -0.000839955 0.238145</pose>
<pose>-0.0856132 -0.000839955 0.238145 0 0 0</pose>
<inertia>
<ixx>2.2343</ixx>
<ixy>-0.023642</ixy>

View File

@ -5,7 +5,7 @@
<version>1.0</version>
<sdf version="1.2">model-1_2.sdf</sdf>
<sdf version="1.3">model-1_3.sdf</sdf>
<sdf version="1.4">model-1_4.sdf</sdf>
<sdf version="1.4">model.sdf</sdf>
<author>
<name>Stefan Kohlbrecher</name>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<sdf version="1.3">
<sdf version="1.4">
<model name="nist_stairs_120">
<static>true</static>
<link name="nist_stairs_120_link">

View File

@ -1,5 +1,5 @@
<?xml version="1.0" ?>
<sdf version="1.3">
<sdf version="1.4">
<model name="saucepan">
<link name="link">
<inertial>