Merge branch 'master' into navigator_rewrite

Browse Source

Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/state_machine_helper.h
	src/modules/mavlink/mavlink_messages.cpp

...

This commit is contained in:

Julian Oes

2014-06-27 14:39:36 +02:00

parent 3aab37e0e0 f3a77705a7

commit cc8f7f4c97

21 changed files with 834 additions and 546 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/modules/mavlink/mavlink_messages.cpp

+594 -350

File diff suppressed because it is too large Load Diff