diff options
| author | Julian Oes <julian@oes.ch> | 2014-03-07 10:38:31 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-03-07 10:38:31 +0100 |
| commit | 873fa4cb40a8ac5b57f3212bb233027f422b92a3 (patch) | |
| tree | 530f317645a7f3293e204f37eca0172ec2d45eb0 /src/modules/sdlog2/logbuffer.c | |
| parent | 40f2d581bffacbf214edfcadac3a57756d605196 (diff) | |
| parent | cf9fa61a39f83e6fe4611ecf9336c1fcd1faaa78 (diff) | |
| download | px4-firmware-873fa4cb40a8ac5b57f3212bb233027f422b92a3.tar.gz px4-firmware-873fa4cb40a8ac5b57f3212bb233027f422b92a3.tar.bz2 px4-firmware-873fa4cb40a8ac5b57f3212bb233027f422b92a3.zip | |
Merge remote-tracking branch 'px4/master' into bottle_drop
Conflicts:
ROMFS/px4fmu_common/init.d/rcS
Diffstat (limited to 'src/modules/sdlog2/logbuffer.c')
| -rw-r--r-- | src/modules/sdlog2/logbuffer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/modules/sdlog2/logbuffer.c b/src/modules/sdlog2/logbuffer.c index b3243f7b5..6a29d7e5c 100644 --- a/src/modules/sdlog2/logbuffer.c +++ b/src/modules/sdlog2/logbuffer.c @@ -1,7 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2013 PX4 Development Team. All rights reserved. - * Author: Anton Babushkin <anton.babushkin@me.com> + * Copyright (c) 2013, 2014 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 |