James Cotton 6948f1dc41 Merge remote-tracking branch 'origin/master' into next ... Conflicts: package/winx86/translations/strings_de.nsh		2012-08-03 09:35:18 -05:00
..
openpilotgcs	Merge remote-tracking branch 'origin/master' into next	2012-08-03 09:35:18 -05:00
uavobjects	GCS - Strangely QtCreator builds stopped working for me after compiling Wireshark on Ubuntu.	2012-07-09 14:52:41 +01:00
uavobjgenerator	Merge branch 'next' into thread/OP-642	2012-07-01 12:25:23 +02:00
ground.pro	Change reference to svn by git (in comments, no code change)	2011-04-24 20:23:20 +03:00