Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revisionBoth sides next revision
installation:catkin [2015/07/21 09:57] – [Installation from source] daniel86installation:catkin [2016/04/27 11:45] – [Installation from source] daniel86
Line 12: Line 12:
   rosdep update   rosdep update
   cd ~/catkin_ws/src   cd ~/catkin_ws/src
-  wstool merge https://raw.github.com/knowrob/knowrob/indigo/rosinstall/knowrob-base.rosinstall+  wstool merge https://raw.github.com/knowrob/knowrob/master/rosinstall/knowrob-base.rosinstall
   wstool update   wstool update
   rosdep install --ignore-src --from-paths stacks/   rosdep install --ignore-src --from-paths stacks/
Line 21: Line 21:
   rosdep update   rosdep update
   cd ~/catkin_ws/src   cd ~/catkin_ws/src
-  wstool merge https://raw.github.com/knowrob/knowrob/indigo/rosinstall/knowrob-tutorial.rosinstall+  wstool merge https://raw.github.com/knowrob/knowrob/master/rosinstall/knowrob-tutorial.rosinstall
   wstool update   wstool update
   rosdep install --ignore-src --from-paths stacks/   rosdep install --ignore-src --from-paths stacks/
Line 30: Line 30:
   rosdep update   rosdep update
   cd ~/catkin_ws/src   cd ~/catkin_ws/src
-  wstool merge https://raw.github.com/knowrob/knowrob/indigo/rosinstall/knowrob-dev.rosinstall+  wstool merge https://raw.github.com/knowrob/knowrob/master/rosinstall/knowrob-dev.rosinstall
   wstool update   wstool update
   rosdep install --ignore-src --from-paths stacks/   rosdep install --ignore-src --from-paths stacks/