Statistics
| Branch: | Revision:

root / scout / libscout / src / behaviors / pause_scout.h @ 64ee446f

History | View | Annotate | Download (1.49 KB)

# Date Author Comment
9a88eb2e 11/12/2012 06:34 pm Priya

Fixed pause so that it compiles. Also changed behavior gui so that it starts with Scout1 automatically.

27f73b95 11/09/2012 10:45 am Matt Bryant

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