Public Git Hosting - librepilot.git/commit

commit	0e0e6a1a1c9848e00e530495022bf97eb16d7e96
author	Alessio Morale <alessiomorale@gmail.com>
	Sun, 12 Jul 2015 08:39:43 +0000 (12 10:39 +0200)
committer	Alessio Morale <alessiomorale@gmail.com>
	Sun, 12 Jul 2015 08:39:43 +0000 (12 10:39 +0200)
tree	01fdb269a02ce4a2d081fd08f8bd569374ab0b02	tree \| snapshot (tar.gz zip)
parent	e12b57ccac01ff5798874c84db21c8ab0e70a2af	commit \| diff
parent	4ae9bfe3f778eaff53f29d3a65218d9992ce9bf4	commit \| diff

Merge branch 'laurent/LP-03_Artwork_rebranding' of git://github.com/f5soh/LibrePilot into f5soh-laurent/LP-03_Artwork_rebranding

Conflicts:
package/winx86/openpilotgcs.nsi

RSS Atom

ground/openpilotgcs/src/app/app.pro	diff1 \|	diff2 \|	blob \| history
ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp	diff1 \|	diff2 \|	blob \| history
ground/openpilotgcs/src/share/default_configurations/OpenPilotGCS.xml	diff1 \|	diff2 \|	blob \| history
package/winx86/openpilotgcs.nsi	diff1 \|	diff2 \|	blob \| history