diff options
| author | Trent Lukaczyk <aerialhedgehog@gmail.com> | 2015-02-05 20:19:04 -0800 |
|---|---|---|
| committer | Trent Lukaczyk <aerialhedgehog@gmail.com> | 2015-02-05 20:19:04 -0800 |
| commit | 531eaa231486c6af46394f6842d420447cb0ee0e (patch) | |
| tree | e7a90d8c50d700a2b7aff05c5a545162810d4967 /launch/gazebo_iris_empty_world.launch | |
| parent | 6798aee13a5bb885966960cdba6ab57b14278ab0 (diff) | |
| parent | 7e6198b3dd517e1158431c8344c5912a6c28b363 (diff) | |
| download | px4-firmware-531eaa231486c6af46394f6842d420447cb0ee0e.tar.gz px4-firmware-531eaa231486c6af46394f6842d420447cb0ee0e.tar.bz2 px4-firmware-531eaa231486c6af46394f6842d420447cb0ee0e.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'launch/gazebo_iris_empty_world.launch')
| -rw-r--r-- | launch/gazebo_iris_empty_world.launch | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/launch/gazebo_iris_empty_world.launch b/launch/gazebo_iris_empty_world.launch new file mode 100644 index 000000000..833aaf07a --- /dev/null +++ b/launch/gazebo_iris_empty_world.launch @@ -0,0 +1,6 @@ +<launch> + +<include file="$(find mav_gazebo)/launch/iris_empty_world_with_joy.launch" /> +<include file="$(find px4)/launch/iris.launch" /> + +</launch> |