aboutsummaryrefslogtreecommitdiffstats
path: root/libraries/Servo/Servo.h
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@mit.edu>2010-12-21 10:27:37 -0500
committerMarti Bolivar <mbolivar@mit.edu>2010-12-21 10:27:37 -0500
commitc45bccad44187da27505cf5808424e709e3f54a1 (patch)
tree18a459a50f8d0551ba046e30462c93999d982725 /libraries/Servo/Servo.h
parent84fd2532a7f23d20354ff590790b3f892cb7e7d7 (diff)
parentd5ad2a27f4e69e6cc9324331945937c983c30366 (diff)
downloadlibrambutan-c45bccad44187da27505cf5808424e709e3f54a1.tar.gz
librambutan-c45bccad44187da27505cf5808424e709e3f54a1.zip
Merge branch 'master' into debug-serialusb.
Chose debug-serialusb version in cases of conflict. Conflicts: libmaple/usb/usb_callbacks.c
Diffstat (limited to 'libraries/Servo/Servo.h')
-rw-r--r--libraries/Servo/Servo.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libraries/Servo/Servo.h b/libraries/Servo/Servo.h
index d35572a..1c75618 100644
--- a/libraries/Servo/Servo.h
+++ b/libraries/Servo/Servo.h
@@ -27,7 +27,7 @@
#include <stdint.h>
-#include "HardwareTimer.h"
+#include "wirish.h" /* hack for IDE compile */
/* Note on Arduino compatibility: