diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 00:05:29 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 00:05:29 +0200 |
| commit | 5559e568b6e5502ad51ec96fd531876c1191d641 (patch) | |
| tree | bc6356b5bed0481cced4a7d7e7ef99bd225d91a7 /src/modules/systemlib/module.mk | |
| parent | 863385dbc4243c8ecb19890a0dfce4a0b7ead9d6 (diff) | |
| parent | d67089b23f58ac152253f58c5deaebbd57db0362 (diff) | |
| download | px4-firmware-safelink.tar.gz px4-firmware-safelink.tar.bz2 px4-firmware-safelink.zip | |
Merged master into safelinksafelink
Diffstat (limited to 'src/modules/systemlib/module.mk')
| -rw-r--r-- | src/modules/systemlib/module.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/systemlib/module.mk b/src/modules/systemlib/module.mk index 3953b757d..147903aa0 100644 --- a/src/modules/systemlib/module.mk +++ b/src/modules/systemlib/module.mk @@ -1,6 +1,6 @@ ############################################################################ # -# Copyright (C) 2012 PX4 Development Team. All rights reserved. +# Copyright (c) 2012-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 @@ -52,5 +52,6 @@ SRCS = err.c \ rc_check.c \ otp.c \ board_serial.c \ - pwm_limit/pwm_limit.c + pwm_limit/pwm_limit.c \ + circuit_breaker.c |