Merge branch 'master' of login.stud.ntnu.no:ur5demo

Conflicts: config.pyc
2014-08-07 11:36:39 +02:00 · 2014-08-07 11:36:39 +02:00 · 45224fd4b6
commit 45224fd4b6
parent ddfa9af2c7 c507a58a36
7 changed files with 3 additions and 0 deletions
--- a/config.pyc
+++ b/config.pyc
--- a/requirements.txt
+++ b/requirements.txt
@ -0,0 +1,3 @@
+math3d (version 2.0.0)
+numpy
+pygame
--- a/ur5controller.pyc
+++ b/ur5controller.pyc
--- a/urx/init.pyc
+++ b/urx/init.pyc
--- a/urx/robot.pyc
+++ b/urx/robot.pyc
--- a/urx/urrtmon.pyc
+++ b/urx/urrtmon.pyc
--- a/urx/ursecmon.pyc
+++ b/urx/ursecmon.pyc