Laurent Lalanne 9e3d464523 Merge branch 'master' into translations_next ... Conflicts: ground/openpilotgcs/copydata.pro ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts		2013-10-25 11:27:28 +02:00
..
openpilotgcs	Merge branch 'master' into translations_next	2013-10-25 11:27:28 +02:00
share.pro	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00