Merge beta in master

This commit is contained in:
Lorenz Meier
2015-08-23 11:21:38 +02:00
10 changed files with 134 additions and 70 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved.
* Copyright (c) 2012-2015 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions