Philippe Renon 174b9bb611 Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next ... Conflicts: ground/openpilotgcs/src/python.pri		2014-08-26 00:08:53 +02:00
..
openpilotgcs	Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next	2014-08-26 00:08:53 +02:00
uavobject-synthetics	Normalize line endings	2013-04-07 09:49:13 +03:00
uavobjgenerator	OP-1291 fix Matlab/Octave converter after UAVTalk changes.	2014-04-05 13:00:55 +02:00
.gitattributes	OP-910: fix line endings and whitespaces (didn't work on Linux)	2013-06-05 23:21:54 +03:00
ground.pro	git merge next	2013-12-18 20:14:26 +01:00