mirror of
https://github.com/arduino/Arduino.git
synced 2024-11-29 10:24:12 +01:00
df9835efaf
Conflicts: app/src/processing/app/Editor.java app/src/processing/app/Sketch.java build/shared/examples/4.Communication/SerialCallResponse/SerialCallResponse.pde build/shared/lib/theme/theme.txt hardware/arduino/cores/arduino/HardwareSerial.h hardware/arduino/cores/arduino/Print.cpp hardware/arduino/cores/arduino/WString.h hardware/arduino/variants/mega/pins_arduino.h libraries/Ethernet/examples/PachubeClient/PachubeClient.ino libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino libraries/Firmata/examples/EchoString/EchoString.ino libraries/SD/File.cpp libraries/SoftwareSerial/SoftwareSerial.cpp libraries/SoftwareSerial/SoftwareSerial.h libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino libraries/SoftwareSerial/keywords.txt |
||
---|---|---|
.. | ||
EEPROM | ||
Ethernet | ||
Firmata | ||
LiquidCrystal | ||
Mouse/examples/JoystickMouseControl | ||
SD | ||
Servo | ||
SoftwareSerial | ||
SPI | ||
Stepper | ||
Wire |