Skip to content
Commit 69b8cd64 authored by dogmaphobic's avatar dogmaphobic
Browse files

Merge remote-tracking branch 'origin/master' into position 

* origin/master:
  Consistent buttons in Fly and Mission views.

Conflicts:
	src/MissionEditor/MissionEditor.qml
parents 26139748 827bab13
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