1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
LibrePilot/ground
James Cotton c7ff2a46c7 Merge remote-tracking branch 'origin/laurent/modelview' into revolution
Conflicts:
	flight/CopterControl/Makefile
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
2012-03-22 02:58:24 -05:00
..
openpilotgcs Merge remote-tracking branch 'origin/laurent/modelview' into revolution 2012-03-22 02:58:24 -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