diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-07-04 15:28:02 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-07-04 15:28:02 +0200 |
| commit | 904cfd7c493e2e6f3d67ba03e9a24c14d9e62b6e (patch) | |
| tree | 009971a34ecac4218edd58dd50820bb8c2b1cd3f /src/modules/systemlib/module.mk | |
| parent | 59775efaad782a1e4f5e346832407c71f1355c89 (diff) | |
| parent | 2389a11af1249f657d85d36a5e71db83940a7959 (diff) | |
| download | px4-firmware-904cfd7c493e2e6f3d67ba03e9a24c14d9e62b6e.tar.gz px4-firmware-904cfd7c493e2e6f3d67ba03e9a24c14d9e62b6e.tar.bz2 px4-firmware-904cfd7c493e2e6f3d67ba03e9a24c14d9e62b6e.zip | |
Merge branch 'master' into navigator_rewrite_drton
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 |