James Cotton af02eb6517 Merge branch 'sim' into testing ... Conflicts: ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro		2012-04-14 14:40:43 -05:00
..
openpilotgcs	Merge branch 'sim' into testing	2012-04-14 14:40:43 -05:00
uavobjects	Fix 64-Bit Linux build problem in QT-Creator	2011-04-03 16:25:21 +00:00
uavobjgenerator	Merge branch 'next' into revolution	2012-03-03 11:41:41 -06:00
ground.pro	Change reference to svn by git (in comments, no code change)	2011-04-24 20:23:20 +03:00