Alessio Morale 000ba5e8f3 Merge remote-tracking branch 'origin/laurent/OP-1172_fonts_in_default_config_files' into next ... Conflicts: ground/openpilotgcs/share/openpilotgcs/default_configurations/Developer.xml ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml		2014-04-15 22:42:18 +02:00
..
openpilotgcs	Merge remote-tracking branch 'origin/laurent/OP-1172_fonts_in_default_config_files' into next	2014-04-15 22:42:18 +02:00
share.pro	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00