History | View | Annotate | Download (1.22 KB)
Fixed pause and resume. Kind of. There are lots of bugs with the GUI.
Merge branch 'master' of ssh://roboclub.org/home/svn/scoutos
Conflicts: scout/libscout/CMakeLists.txt scout/libscout/src/BehaviorList.cpp scout/libscout/src/BehaviorList.h