Merge branch 'hydro-devel' of github.com:ros-industrial/universal_robot into ur10_moveit

cb7e8cda · ipa-fxm · 98f227c8 · fc5525da · cb7e8cda
Commit cb7e8cda authored 10 years ago by ipa-fxm
--- a/ur_driver/CMakeLists.txt
+++ b/ur_driver/CMakeLists.txt
@@ -107,7 +107,7 @@ install(PROGRAMS src/ur_driver/driver.py
 # )

 ## Mark other files for installation (e.g. launch and bag files, etc.)
-install(FILES test.launch prog prog_reset
+install(FILES prog prog_reset
  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )