commit 464ee1a9863d3b71ef1cc27e2fb118f054225789
author Austin Schuh <aschuh@localhost> Fri Mar 01 22:37:39 2013 -0800
committer Austin Schuh <austin.linux@gmail.com> Tue Mar 05 21:34:45 2013 -0800
tree 4ca5bd3dbc69587ff5a5f935084775ae98b594ff
parent 30efeb7db8b2029384b250b5c54f2d8f0d19d20f

Merged some code from Brian so that it builds on the bot.

frc971/atom_code/atom_code.gyp

diff --git a/frc971/atom_code/atom_code.gyp b/frc971/atom_code/atom_code.gyp
index 01545ff..e0f9bb2 100644
--- a/frc971/atom_code/atom_code.gyp
+++ b/frc971/atom_code/atom_code.gyp
@@ -6,6 +6,7 @@
       'dependencies': [
         '<(AOS)/build/aos_all.gyp:Atom',
         '../control_loops/control_loops.gyp:DriveTrain',
+        '../control_loops/control_loops.gyp:wrist',
         '../control_loops/control_loops.gyp:wrist_lib_test',
         '../input/input.gyp:JoystickReader',
         '../input/input.gyp:SensorReader',