Zach Eveland
a6a59f1783
Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot"
...
This reverts commit df9835efafec45af8bfa
2011-10-27 11:45:13 -04:00
Zach Eveland
df9835efaf
Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot
...
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
2011-10-27 09:32:27 -04:00
David A. Mellis
b722028c7b
Updating to Firmata r82 (e.g. including I2C in StandardFirmata).
...
http://code.google.com/p/arduino/issues/detail?id=633
2011-09-09 17:11:42 -04:00
David A. Mellis
108df37445
Updating Firmata to r71.
...
Note that I also changed the extensions of the examples (firmwares) from .pde to .ino and removed the Makefiles (since they assume the pde extension).
http://code.google.com/p/arduino/issues/detail?id=447
2011-09-02 14:43:44 -04:00
Tom Igoe
35777612c0
Changed all .pde examples to .ino
...
All examples in /build/shared/examples/ and /libraries/ have had their
extensions changed to .ino
2011-08-30 15:33:32 -04:00
