History | View | Annotate | Download (7.08 KB)
Fixed pause so that it compiles. Also changed behavior gui so that it starts with Scout1 automatically.
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
Added initial GUI for testing, renamed cw and ccw behaviors