1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
LibrePilot/ground
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
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