Merge branch 'master' into navigator_rewrite

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
21 changed files with 834 additions and 546 deletions
-1
View File
@@ -992,7 +992,6 @@ MavlinkReceiver::receive_start(Mavlink *parent)
(void)pthread_attr_setschedparam(&receiveloop_attr, &param);
pthread_attr_setstacksize(&receiveloop_attr, 2900);
pthread_t thread;
pthread_create(&thread, &receiveloop_attr, MavlinkReceiver::start_helper, (void *)parent);