James Cotton f20e5da9ed Merge branch 'next' into revolution ... Conflicts: ground/openpilotgcs/src/plugins/config/config.pro ground/openpilotgcs/src/plugins/config/configrevowidget.h ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp		2012-03-03 11:41:41 -06:00
..
openpilotgcs	Merge branch 'next' into revolution	2012-03-03 11:41:41 -06: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