| Age | Commit message (Collapse) | Author |
|---|
|
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
app/src/processing/app/Base.java
build/shared/revisions.txt
hardware/arduino/avr/cores/arduino/malloc.c
hardware/arduino/cores/arduino/avr-libc/malloc.c
hardware/arduino/cores/arduino/malloc.c
todo.txt
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
libraries folder
|
|
|
|
|
|
|
|
|
|
are searched per board/platform
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
TIFR into bitwise-or's. Otherwise, this broke millis() by disabling the timer 0 overflow interrupt.
|
|
|
|
|
|
|
|
|
|
|
|
timer 1, and, on the Mega, timers 3, 4, and 5 for up to 12 servos (48 on the Mega).
|
|
|
|
|
