16 Dec, 2014

2 commits


08 Dec, 2014

3 commits


07 Dec, 2014

4 commits

  • Conflicts:
    	me530646_lab0/src/lab0_main.cpp
    	me530646_lab1/.DS_Store
    	me530646_lab1/CMakeLists.txt
    	me530646_lab1/include/me530646_lab1/lab1.h
    	me530646_lab1/lab1.pdf
    	me530646_lab1/launch/conf.rviz
    	me530646_lab1/launch/rviz.launch
    	me530646_lab1/package.xml
    	me530646_lab1/src/.DS_Store
    	me530646_lab1/src/lab1.cpp
    	me530646_lab1/src/lab1.cpp~
    	me530646_lab1/src/lab1_main.cpp
    	me530646_lab1/src/lab1_main.cpp~
    	me530646_lab2/.DS_Store
    	me530646_lab2/CMakeLists.txt
    	me530646_lab2/include/.DS_Store
    	me530646_lab2/include/me530646_lab2/lab2.h
    	me530646_lab2/launch/conf.rviz
    	me530646_lab2/launch/rviz.launch
    	me530646_lab2/package.xml
    	me530646_lab2/src/.DS_Store
    	me530646_lab2/src/lab2.cpp
    	me530646_lab2/src/lab2.cpp~
    	me530646_lab2/src/lab2_main.cpp
    	me530646_lab2/src/lab2_main.cpp~
    	me530646_lab3/src/lab3.cpp
    	me530646_lab3/src/lab3.cpp~
    	me530646_lab3/src/lab3_main.cpp
    	me530646_lab3/src/lab3_main.cpp~
    	me530646_project/CMakeLists.txt
    	me530646_project/package.xml
    	me530646_project/project.pdf
    	me530646_project/src/project_main.cpp
    	me530646_project/src/project_main.cpp~
    	ur5/.DS_Store
    	ur5/CMakeLists.txt
    	ur5/NotesOnPublishing
    	ur5/include/ur5/utilities.h
    	ur5/launch/ur5_gazebo.launch
    	ur5/launch/ur5_gui_rviz.launch
    	ur5/launch/ur5_rviz.launch
    	ur5/launch/urdf.rviz
    	ur5/msg/ur5_joints.msg
    	ur5/package.xml
    	ur5/src/.DS_Store
    	ur5/src/arm_controller_commander.cpp
    	ur5/src/rviz_joint_state_publisher.cpp
    	ur5/src/utilities.cpp
    	ur5/urdf/gazebo/ur5.urdf
    	ur5/urdf/gazebo/ur5.urdf.xacro
    	ur5/urdf/gazebo/ur5.xacro
    	ur5/urdf/rviz/base.urdf
    	ur5/urdf/rviz/individual_links/base.urdf
    	ur5/urdf/rviz/individual_links/forearm.urdf
    	ur5/urdf/rviz/individual_links/shoulder.urdf
    	ur5/urdf/rviz/individual_links/upper_arm.urdf
    	ur5/urdf/rviz/individual_links/wrist_1.urdf
    	ur5/urdf/rviz/individual_links/wrist_2.urdf
    	ur5/urdf/rviz/individual_links/wrist_3.urdf
    	ur5/urdf/rviz/ur5.urdf
    	ur5/urdf/rviz/ur5.urdf.xacro
    	ur5/urdf/rviz/ur5.xacro
    Amirhossein Farvardin
     
  • Amirhossein Farvardin
     
  • Chris Dooley
     
  • Chris Dooley
     

03 Dec, 2014

3 commits