diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-02-01 11:06:47 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-02-01 11:06:47 +0100 |
| commit | 84ff3c671d5c6d00a1b6c9a8062bddfb6875f8f9 (patch) | |
| tree | db0470a2471776e9ffe525b2fa7302cec7ab8bd8 /src/modules/uORB/Subscription.hpp | |
| parent | 7c958a2cca90a6262dc491fe9ef86d85bacdf3da (diff) | |
| parent | a2a244584e36a0e9ffdb93a0dda8473baf8344d3 (diff) | |
| download | px4-firmware-84ff3c671d5c6d00a1b6c9a8062bddfb6875f8f9.tar.gz px4-firmware-84ff3c671d5c6d00a1b6c9a8062bddfb6875f8f9.tar.bz2 px4-firmware-84ff3c671d5c6d00a1b6c9a8062bddfb6875f8f9.zip | |
Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge2_attctrl_posctrl
Conflicts:
src/drivers/px4fmu/fmu.cpp
Diffstat (limited to 'src/modules/uORB/Subscription.hpp')
| -rw-r--r-- | src/modules/uORB/Subscription.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/uORB/Subscription.hpp b/src/modules/uORB/Subscription.hpp index f82586285..12301ce96 100644 --- a/src/modules/uORB/Subscription.hpp +++ b/src/modules/uORB/Subscription.hpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (C) 2012 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 |