mirror of
https://github.com/arduino/Arduino.git
synced 2024-12-01 12:24:14 +01:00
62b723357c
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 |
||
---|---|---|
.. | ||
BandManagement | ||
GsmScanNetworks | ||
PinManagement | ||
TestGPRS | ||
TestModem | ||
TestWebServer |