aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino/main.cpp
diff options
context:
space:
mode:
authorZach Eveland <zeveland@blacklabel-development.com>2011-09-05 12:53:45 -0400
committerZach Eveland <zeveland@blacklabel-development.com>2011-09-05 12:53:45 -0400
commit280f381265f8b8e339c92cbcb95d09cec1ec2f19 (patch)
tree157b6b2894b97287414d589f6699f22083b507f2 /cores/arduino/main.cpp
parent90ea0707e6e3fb251b3eaf6c8682f68dd44299e1 (diff)
parent560a510f6434efdfa0ebcfa9cd01093714e37f43 (diff)
Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension
Conflicts: build/macosx/dist/tools-universal.zip build/windows/avr_tools.zip hardware/arduino/cores/arduino/HardwareSerial.cpp
Diffstat (limited to 'cores/arduino/main.cpp')
-rwxr-xr-xcores/arduino/main.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp
index ba00ae0..097f5ed 100755
--- a/cores/arduino/main.cpp
+++ b/cores/arduino/main.cpp
@@ -11,8 +11,10 @@ int main(void)
setup();
- for (;;)
+ for (;;) {
loop();
+ serialEventRun();
+ }
return 0;
}