Skip to content
Commit dfabe611 authored by Jessica's avatar Jessica
Browse files

Merge branch 'organize' of https://github.com/jjhall89/qgroundcontrol into organize 

Conflicts:
	qgroundcontrol.pri
parents 16e84a54 ceead0c5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment