arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity
4,255 Commits 13 Branches 37 Tags
ee48c36a71c2ee6cf5f65c8a6b703ad78e90d29d
Commit Graph

97 Commits

Author SHA1 Message Date
Ivan Grokhotkov
c7e363ca7b Merge arduino/master into esp8266 
* commit '71c39489180723b13cabe3c07e3994a239f8a03e':
  Updated translations
  Updated offline docs
  Corrected some email contacts.
  MacOS tests fix: new way of discovering work dir conflicts with tests execution. Fixed.
  Updated build_pull_request.bash
  Renamed mac build from "macosxnew" to "macosx-java-latest"
  Updated revision log. Version set to 1.6.0rc3
  build.xml and mac. Change in platform names: macosx now macosxnew, oldmacosx now macosx
  Fixed bug with paths with spaces
  build_pull_requests now builds oldmacosx as well
  Macosx: new appbundler, new macosx builds. Use platform=macosx and platform=oldmacosx
  build_pull_requests now moves the artifacts to the parent folder: this allows calling "clean" target before each build
  build.xml linux-clean target was not deleting old linux builds
  Fix typos in BlinkWithoutDelay.ino

Conflicts:
	build/build.xml
 2015-02-09 17:39:30 +03:00
Federico Fissore
d460982623 Macosx: new appbundler, new macosx builds. Use platform=macosx and platform=oldmacosx 2015-02-02 09:53:56 +01:00
Ivan Grokhotkov
95f969cb7c Merge branch 'master' into esp8266 
* master: (148 commits)
  Update revision log
  Cherry picked fix from 87865ac19d
  Updated revision log
  Added dependencies for AStylej.dll
  Updated translations
  Update revision log
  Temporary fix for pulseIn() regression.
  Added README.adoc for the library manager project
  Fixed some libraries metadata.
  Temporary disabled DefaultTargetTest under certain conditions
  Updated translation from transifex
  Updated some translation strings
  Fixed test
  sam: Fixed initialization of UART/USART mode register
  update revision log
  Fixed NPE when import menu are empty
  Fixed NPE when currently selected platform is no more installed.
  Optimized FileUtils.recursiveDelete(File) function
  Fixed a bunch of simple warnings in java code
  Removed unused classes Commander.java and Webserver.java
  ...
 2015-01-26 02:35:02 +03:00
Ivan Grokhotkov
541dbaddce Add download links for xtensa toolchain and esptool, add sha sums 2014-12-23 13:35:07 +03:00
Cristian Maglie
d1f4e0370d arduino-core project is now correctly compiled through ant build script 2014-11-13 16:34:24 +01:00
Cristian Maglie
be96ae3a6a Removed no more used 'core' project 2014-11-13 16:23:40 +01:00
dpslwk
b8623a4338 (Mac OSX) Improve Quick look and syntax highlighting under OSX 
An exported UTI declaration means that the type is available for use by all other parties.
By adding an this declaration for ino files, it allows Quick Look to display file content and
external editors (like Xcode) to automatically syntax highlight .ino files as C++
 2014-11-04 14:24:18 +00:00
Cristian Maglie
f346092818 Revert appbundler until we figure out how to support OSX 10.6 2014-07-04 14:06:57 +02:00
Cristian Maglie
c2e5f67ea6 Updated arm gcc to version 4.8.3-2014q1 2014-06-25 11:59:47 +02:00
Cristian Maglie
4df2c8982a Updated arm gcc to 4.8.3 2014-06-25 11:57:49 +02:00
Cristian Maglie
3a4381955e Updated arm gcc to 4.7.4 2014-06-25 11:56:50 +02:00
Federico Fissore
792e7fd7df Toolchain update 2014-06-25 10:14:34 +02:00
Federico Fissore
7f3e488310 Updated toolchains 2014-06-25 10:14:34 +02:00
Federico Fissore
c778de0211 Toolchains updated: avrdude 6.0.1 replaces 5.11 2014-06-25 10:14:34 +02:00
Federico Fissore
98c3080d2a New toolchain: gcc 4.8.1, avr-libc 1.8.0, binutils 2.23.2 2014-06-25 10:14:34 +02:00
Federico Fissore
4ebf88b1b2 Toolchains updated, sha1sum updates follow 2014-06-25 10:12:40 +02:00
Federico Fissore
ca06ef91c7 Toolchains updated, sha1sum updates follow 2014-06-25 10:12:40 +02:00
Federico Fissore
879bacdcb0 Updated avr toolchain for macosx: should be compatible with macosx 10.6+ (was 10.7+) 2014-06-25 10:12:40 +02:00
Federico Fissore
3b74226f0d Fixed MacOSX AVR toolchain .zip checksum 2014-06-25 10:12:40 +02:00
Federico Fissore
5a015b3eec New common AVR toolchain 2014-06-25 10:12:39 +02:00
Cristian Maglie
fbea640055 Fixed macosx app template to reflect jssc update 2014-01-29 16:40:49 +01:00
Federico Fissore
4b3717bc53 jssc: updated config files (eclipse, ant build.xml, windows launcher, mac template.app), removed rxtx binaries 2013-11-28 17:27:13 +01:00
Federico Fissore
effb59da4b Merge remote-tracking branch 'arduino/ide-1.5.x' into dev-ide-1.5.x-discovery 2013-09-06 12:59:24 +02:00
Cristian Maglie
690eac4047 Moved arm-gcc upgrade to specific development branch 2013-08-30 10:58:16 +02:00
Cristian Maglie
ea8c14421a Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery 
Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java
 2013-08-23 15:59:24 +02:00
Cristian Maglie
960c517b51 Updated ARM gcc for win32 and macos to version 4.7.4 2013-08-05 17:23:45 +02:00
Federico Fissore
21203cbe1b introducing jsch. now network monitor uses SSH to trigger a telnet session at yun side 2013-06-11 15:02:10 +02:00
Federico Fissore
79952e9691 linux, macosx, windows build scripts and confs 
temporary lock image
 2013-05-06 12:31:03 +02:00
Federico Fissore
0d47f22787 working on #223: Auto-detection of serial ports. Mac version ready even if a bit slow 2013-05-06 12:31:01 +02:00
Cristian Maglie
d6ba36b0a5 Reverted RXTX 2.1 native lib for mac 2013-03-30 18:26:46 +01:00
Federico Fissore
cdf2b8d9fe right macosx rxtx lib 2013-03-01 18:34:31 +01:00
Federico Fissore
849af97ac1 reverting to old RXTX, patched 2013-02-27 17:56:09 +01:00
Cristian Maglie
4d3a9a4bf0 Revert "removing old rxtx references" 
This reverts commit 719f79c037.
 2013-02-27 17:54:48 +01:00
Federico Fissore
719f79c037 removing old rxtx references 2013-02-27 13:42:45 +01:00
Federico Fissore
b57701ed01 updated rxtx libs to every OS 2013-02-11 18:13:07 +01:00
Cristian Maglie
aba27c43aa Merged upstream arduino branch 2012-10-18 15:50:09 +02:00
Cristian Maglie
df37eebdd5 Updated bossac 2012-10-10 19:06:34 +02:00
Cristian Maglie
3360740b3e Updated bossac, various workarounds. 2012-09-13 21:47:12 +02:00
Cristian Maglie
19f1117c68 updated bossac for Mac for auto-reset support 2012-08-14 21:54:08 +02:00
David A. Mellis
409da1d9c7 Adding NSHighResolutionCapable to Mac Info.plist file. 
Apparently this makes things look or work better on the new MacBook Pro w/ Retina display.

http://code.google.com/p/arduino/issues/detail?id=982
 2012-08-07 16:46:57 -04:00
David A. Mellis
4b25cc2097 Removing local xcode files. 2012-06-14 15:58:30 +01:00
David A. Mellis
f833374312 Adding write(str) and write(buf, size) for USB CDC. 
So that they work on the Leonardo.

http://code.google.com/p/arduino/issues/detail?id=958
 2012-06-14 15:54:13 +01:00
Cristian Maglie
d02af8b680 [sam] added toolchain download for Mac 2012-05-16 13:44:51 +02:00
Cristian Maglie
efbf66ef6b [sam] Updated bossac for mac 2012-05-12 14:10:40 +02:00
Cristian Maglie
a50431e3a4 Merge branch 'new-extension' into HEAD 
Conflicts:
	.classpath
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.jdt.ui.prefs
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	app/src/processing/app/debug/Compiler.java
	build/build.xml
	build/shared/lib/preferences.txt
	hardware/arduino/avr/boards.txt
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168.c
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_ng.hex
	hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex
	hardware/arduino/avr/bootloaders/atmega/Makefile
	hardware/arduino/avr/bootloaders/atmega8/ATmegaBOOT.c
	hardware/arduino/avr/bootloaders/atmega8/ATmegaBOOT.hex
	hardware/arduino/avr/bootloaders/atmega8/Makefile
	hardware/arduino/avr/bootloaders/bt/ATmegaBOOT_168.c
	hardware/arduino/avr/bootloaders/bt/ATmegaBOOT_168.hex
	hardware/arduino/avr/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex
	hardware/arduino/avr/bootloaders/bt/Makefile
	hardware/arduino/avr/bootloaders/lilypad/LilyPadBOOT_168.hex
	hardware/arduino/avr/bootloaders/lilypad/src/ATmegaBOOT.c
	hardware/arduino/avr/bootloaders/lilypad/src/Makefile
	hardware/arduino/avr/bootloaders/optiboot/optiboot.c
	hardware/arduino/avr/bootloaders/optiboot/optiboot_atmega328-Mini.hex
	hardware/arduino/avr/bootloaders/stk500v2/License.txt
	hardware/arduino/avr/bootloaders/stk500v2/Makefile
	hardware/arduino/avr/bootloaders/stk500v2/STK500V2.pnproj
	hardware/arduino/avr/bootloaders/stk500v2/STK500V2.pnps
	hardware/arduino/avr/bootloaders/stk500v2/avrinterruptnames.h
	hardware/arduino/avr/bootloaders/stk500v2/command.h
	hardware/arduino/avr/bootloaders/stk500v2/stk500boot.c
	hardware/arduino/avr/bootloaders/stk500v2/stk500boot.ppg
	hardware/arduino/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
	hardware/arduino/avr/cores/arduino/Arduino.h
	hardware/arduino/avr/cores/arduino/HardwareSerial.cpp
	hardware/arduino/avr/cores/arduino/HardwareSerial.h
	hardware/arduino/avr/cores/arduino/IPAddress.cpp
	hardware/arduino/avr/cores/arduino/IPAddress.h
	hardware/arduino/avr/cores/arduino/Printable.h
	hardware/arduino/avr/cores/arduino/Tone.cpp
	hardware/arduino/avr/cores/arduino/WCharacter.h
	hardware/arduino/avr/cores/arduino/WInterrupts.c
	hardware/arduino/avr/cores/arduino/WMath.cpp
	hardware/arduino/avr/cores/arduino/WString.cpp
	hardware/arduino/avr/cores/arduino/WString.h
	hardware/arduino/avr/cores/arduino/binary.h
	hardware/arduino/avr/cores/arduino/wiring.c
	hardware/arduino/avr/cores/arduino/wiring_analog.c
	hardware/arduino/avr/cores/arduino/wiring_digital.c
	hardware/arduino/avr/cores/arduino/wiring_private.h
	hardware/arduino/avr/cores/arduino/wiring_pulse.c
	hardware/arduino/avr/cores/arduino/wiring_shift.c
	hardware/arduino/avr/firmwares/MEGA-dfu_and_usbserial_combined.hex
	hardware/arduino/avr/firmwares/README.txt
	hardware/arduino/avr/firmwares/UNO-dfu_and_usbserial_combined.hex
	hardware/arduino/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.c
	hardware/arduino/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.h
	hardware/arduino/avr/firmwares/arduino-usbdfu/Board/LEDs.h
	hardware/arduino/avr/firmwares/arduino-usbdfu/Descriptors.c
	hardware/arduino/avr/firmwares/arduino-usbdfu/Descriptors.h
	hardware/arduino/avr/firmwares/arduino-usbdfu/makefile
	hardware/arduino/avr/firmwares/arduino-usbdfu/readme.txt
	hardware/arduino/avr/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex
	hardware/arduino/avr/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex
	hardware/arduino/avr/firmwares/arduino-usbserial/Arduino-usbserial.c
	hardware/arduino/avr/firmwares/arduino-usbserial/Arduino-usbserial.h
	hardware/arduino/avr/firmwares/arduino-usbserial/Board/LEDs.h
	hardware/arduino/avr/firmwares/arduino-usbserial/Descriptors.c
	hardware/arduino/avr/firmwares/arduino-usbserial/Descriptors.h
	hardware/arduino/avr/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h
	hardware/arduino/avr/firmwares/arduino-usbserial/makefile
	hardware/arduino/avr/firmwares/arduino-usbserial/readme.txt
	hardware/arduino/avr/libraries/EEPROM/EEPROM.cpp
	hardware/arduino/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
	hardware/arduino/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
	hardware/arduino/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
	hardware/arduino/avr/libraries/EEPROM/keywords.txt
	hardware/arduino/avr/libraries/Ethernet/Dhcp.cpp
	hardware/arduino/avr/libraries/Ethernet/Dhcp.h
	hardware/arduino/avr/libraries/Ethernet/Dns.cpp
	hardware/arduino/avr/libraries/Ethernet/Dns.h
	hardware/arduino/avr/libraries/Ethernet/Ethernet.cpp
	hardware/arduino/avr/libraries/Ethernet/Ethernet.h
	hardware/arduino/avr/libraries/Ethernet/EthernetClient.cpp
	hardware/arduino/avr/libraries/Ethernet/EthernetServer.cpp
	hardware/arduino/avr/libraries/Ethernet/EthernetUdp.cpp
	hardware/arduino/avr/libraries/Ethernet/EthernetUdp.h
	hardware/arduino/avr/libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.ino
	hardware/arduino/avr/libraries/Ethernet/examples/ChatServer/ChatServer.ino
	hardware/arduino/avr/libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.ino
	hardware/arduino/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino
	hardware/arduino/avr/libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	hardware/arduino/avr/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
	hardware/arduino/avr/libraries/Ethernet/examples/TelnetClient/TelnetClient.ino
	hardware/arduino/avr/libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.ino
	hardware/arduino/avr/libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.ino
	hardware/arduino/avr/libraries/Ethernet/examples/WebClient/WebClient.ino
	hardware/arduino/avr/libraries/Ethernet/examples/WebServer/WebServer.ino
	hardware/arduino/avr/libraries/Ethernet/keywords.txt
	hardware/arduino/avr/libraries/Ethernet/util.h
	hardware/arduino/avr/libraries/Ethernet/utility/socket.cpp
	hardware/arduino/avr/libraries/Ethernet/utility/socket.h
	hardware/arduino/avr/libraries/Ethernet/utility/w5100.cpp
	hardware/arduino/avr/libraries/Ethernet/utility/w5100.h
	hardware/arduino/avr/libraries/Firmata/Boards.h
	hardware/arduino/avr/libraries/Firmata/Firmata.cpp
	hardware/arduino/avr/libraries/Firmata/Firmata.h
	hardware/arduino/avr/libraries/Firmata/LICENSE.txt
	hardware/arduino/avr/libraries/Firmata/TODO.txt
	hardware/arduino/avr/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/EchoString/EchoString.ino
	hardware/arduino/avr/libraries/Firmata/examples/I2CFirmata/I2CFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt
	hardware/arduino/avr/libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/ServoFirmata/ServoFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.ino
	hardware/arduino/avr/libraries/Firmata/examples/StandardFirmata/LICENSE.txt
	hardware/arduino/avr/libraries/Firmata/examples/StandardFirmata/StandardFirmata.ino
	hardware/arduino/avr/libraries/Firmata/keywords.txt
	hardware/arduino/avr/libraries/SD/File.cpp
	hardware/arduino/avr/libraries/SD/README.txt
	hardware/arduino/avr/libraries/SD/SD.cpp
	hardware/arduino/avr/libraries/SD/SD.h
	hardware/arduino/avr/libraries/SD/examples/CardInfo/CardInfo.ino
	hardware/arduino/avr/libraries/SD/examples/Datalogger/Datalogger.ino
	hardware/arduino/avr/libraries/SD/examples/DumpFile/DumpFile.ino
	hardware/arduino/avr/libraries/SD/examples/Files/Files.ino
	hardware/arduino/avr/libraries/SD/examples/ReadWrite/ReadWrite.ino
	hardware/arduino/avr/libraries/SD/examples/listfiles/listfiles.ino
	hardware/arduino/avr/libraries/SD/keywords.txt
	hardware/arduino/avr/libraries/SD/utility/FatStructs.h
	hardware/arduino/avr/libraries/SD/utility/Sd2Card.cpp
	hardware/arduino/avr/libraries/SD/utility/Sd2Card.h
	hardware/arduino/avr/libraries/SD/utility/Sd2PinMap.h
	hardware/arduino/avr/libraries/SD/utility/SdFat.h
	hardware/arduino/avr/libraries/SD/utility/SdFatUtil.h
	hardware/arduino/avr/libraries/SD/utility/SdFatmainpage.h
	hardware/arduino/avr/libraries/SD/utility/SdFile.cpp
	hardware/arduino/avr/libraries/SD/utility/SdInfo.h
	hardware/arduino/avr/libraries/SD/utility/SdVolume.cpp
	hardware/arduino/avr/libraries/SPI/SPI.cpp
	hardware/arduino/avr/libraries/SPI/SPI.h
	hardware/arduino/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino
	hardware/arduino/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.ino
	hardware/arduino/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino
	hardware/arduino/avr/libraries/SPI/keywords.txt
	hardware/arduino/avr/libraries/Servo/Servo.cpp
	hardware/arduino/avr/libraries/Servo/Servo.h
	hardware/arduino/avr/libraries/Servo/examples/Knob/Knob.ino
	hardware/arduino/avr/libraries/Servo/examples/Sweep/Sweep.ino
	hardware/arduino/avr/libraries/Servo/keywords.txt
	hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
	hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.h
	hardware/arduino/avr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	hardware/arduino/avr/libraries/SoftwareSerial/keywords.txt
	hardware/arduino/avr/libraries/Wire/Wire.cpp
	hardware/arduino/avr/libraries/Wire/Wire.h
	hardware/arduino/avr/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino
	hardware/arduino/avr/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino
	hardware/arduino/avr/libraries/Wire/examples/master_reader/master_reader.ino
	hardware/arduino/avr/libraries/Wire/examples/master_writer/master_writer.ino
	hardware/arduino/avr/libraries/Wire/examples/slave_receiver/slave_receiver.ino
	hardware/arduino/avr/libraries/Wire/examples/slave_sender/slave_sender.ino
	hardware/arduino/avr/libraries/Wire/keywords.txt
	hardware/arduino/avr/libraries/Wire/utility/twi.c
	hardware/arduino/avr/libraries/Wire/utility/twi.h
	hardware/arduino/avr/programmers.txt
	hardware/arduino/avr/variants/mega/pins_arduino.h
	hardware/arduino/avr/variants/micro/pins_arduino.h
	hardware/arduino/avr/variants/standard/pins_arduino.h
	hardware/arduino/boards.txt
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168.c
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_ng.hex
	hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex
	hardware/arduino/bootloaders/atmega/Makefile
	hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c
	hardware/arduino/bootloaders/atmega8/ATmegaBOOT.hex
	hardware/arduino/bootloaders/atmega8/Makefile
	hardware/arduino/bootloaders/bt/ATmegaBOOT_168.c
	hardware/arduino/bootloaders/bt/ATmegaBOOT_168.hex
	hardware/arduino/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex
	hardware/arduino/bootloaders/bt/Makefile
	hardware/arduino/bootloaders/lilypad/LilyPadBOOT_168.hex
	hardware/arduino/bootloaders/lilypad/src/ATmegaBOOT.c
	hardware/arduino/bootloaders/lilypad/src/Makefile
	hardware/arduino/bootloaders/optiboot/optiboot.c
	hardware/arduino/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex
	hardware/arduino/bootloaders/stk500v2/License.txt
	hardware/arduino/bootloaders/stk500v2/Makefile
	hardware/arduino/bootloaders/stk500v2/STK500V2.pnproj
	hardware/arduino/bootloaders/stk500v2/STK500V2.pnps
	hardware/arduino/bootloaders/stk500v2/avrinterruptnames.h
	hardware/arduino/bootloaders/stk500v2/command.h
	hardware/arduino/bootloaders/stk500v2/stk500boot.c
	hardware/arduino/bootloaders/stk500v2/stk500boot.ppg
	hardware/arduino/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
	hardware/arduino/cores/arduino/Arduino.h
	hardware/arduino/cores/arduino/HardwareSerial.cpp
	hardware/arduino/cores/arduino/HardwareSerial.h
	hardware/arduino/cores/arduino/Stream.h
	hardware/arduino/cores/arduino/Tone.cpp
	hardware/arduino/cores/arduino/WCharacter.h
	hardware/arduino/cores/arduino/WInterrupts.c
	hardware/arduino/cores/arduino/WMath.cpp
	hardware/arduino/cores/arduino/WString.cpp
	hardware/arduino/cores/arduino/WString.h
	hardware/arduino/cores/arduino/binary.h
	hardware/arduino/cores/arduino/wiring.c
	hardware/arduino/cores/arduino/wiring_analog.c
	hardware/arduino/cores/arduino/wiring_digital.c
	hardware/arduino/cores/arduino/wiring_private.h
	hardware/arduino/cores/arduino/wiring_pulse.c
	hardware/arduino/cores/arduino/wiring_shift.c
	hardware/arduino/firmwares/MEGA-dfu_and_usbserial_combined.hex
	hardware/arduino/firmwares/README.txt
	hardware/arduino/firmwares/UNO-dfu_and_usbserial_combined.hex
	hardware/arduino/firmwares/arduino-usbdfu/Arduino-usbdfu.c
	hardware/arduino/firmwares/arduino-usbdfu/Arduino-usbdfu.h
	hardware/arduino/firmwares/arduino-usbdfu/Board/LEDs.h
	hardware/arduino/firmwares/arduino-usbdfu/Descriptors.c
	hardware/arduino/firmwares/arduino-usbdfu/Descriptors.h
	hardware/arduino/firmwares/arduino-usbdfu/makefile
	hardware/arduino/firmwares/arduino-usbdfu/readme.txt
	hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex
	hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex
	hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial.c
	hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial.h
	hardware/arduino/firmwares/arduino-usbserial/Board/LEDs.h
	hardware/arduino/firmwares/arduino-usbserial/Descriptors.c
	hardware/arduino/firmwares/arduino-usbserial/Descriptors.h
	hardware/arduino/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h
	hardware/arduino/firmwares/arduino-usbserial/makefile
	hardware/arduino/firmwares/arduino-usbserial/readme.txt
	hardware/arduino/pins/mega/pins_arduino.h
	hardware/arduino/pins/standard/pins_arduino.h
	hardware/arduino/programmers.txt
	hardware/avr/boards.txt
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168.c
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168_ng.hex
	hardware/avr/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex
	hardware/avr/bootloaders/atmega/Makefile
	hardware/avr/bootloaders/atmega8/ATmegaBOOT.c
	hardware/avr/bootloaders/atmega8/ATmegaBOOT.hex
	hardware/avr/bootloaders/atmega8/Makefile
	hardware/avr/bootloaders/bt/ATmegaBOOT_168.c
	hardware/avr/bootloaders/bt/ATmegaBOOT_168.hex
	hardware/avr/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex
	hardware/avr/bootloaders/bt/Makefile
	hardware/avr/bootloaders/lilypad/LilyPadBOOT_168.hex
	hardware/avr/bootloaders/lilypad/src/ATmegaBOOT.c
	hardware/avr/bootloaders/lilypad/src/Makefile
	hardware/avr/bootloaders/optiboot/Makefile
	hardware/avr/bootloaders/optiboot/makeall
	hardware/avr/bootloaders/optiboot/optiboot.c
	hardware/avr/bootloaders/optiboot/optiboot_atmega328.hex
	hardware/avr/bootloaders/optiboot/optiboot_atmega328.lst
	hardware/avr/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex
	hardware/avr/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst
	hardware/avr/bootloaders/optiboot/optiboot_diecimila.hex
	hardware/avr/bootloaders/optiboot/optiboot_diecimila.lst
	hardware/avr/bootloaders/optiboot/optiboot_lilypad.hex
	hardware/avr/bootloaders/optiboot/optiboot_lilypad.lst
	hardware/avr/bootloaders/optiboot/optiboot_lilypad_resonator.hex
	hardware/avr/bootloaders/optiboot/optiboot_lilypad_resonator.lst
	hardware/avr/bootloaders/optiboot/optiboot_luminet.hex
	hardware/avr/bootloaders/optiboot/optiboot_luminet.lst
	hardware/avr/bootloaders/optiboot/optiboot_pro_16MHz.hex
	hardware/avr/bootloaders/optiboot/optiboot_pro_16MHz.lst
	hardware/avr/bootloaders/optiboot/optiboot_pro_20mhz.hex
	hardware/avr/bootloaders/optiboot/optiboot_pro_20mhz.lst
	hardware/avr/bootloaders/optiboot/optiboot_pro_8MHz.hex
	hardware/avr/bootloaders/optiboot/optiboot_pro_8MHz.lst
	hardware/avr/bootloaders/stk500v2/License.txt
	hardware/avr/bootloaders/stk500v2/Makefile
	hardware/avr/bootloaders/stk500v2/STK500V2.pnproj
	hardware/avr/bootloaders/stk500v2/STK500V2.pnps
	hardware/avr/bootloaders/stk500v2/avrinterruptnames.h
	hardware/avr/bootloaders/stk500v2/command.h
	hardware/avr/bootloaders/stk500v2/stk500boot.c
	hardware/avr/bootloaders/stk500v2/stk500boot.ppg
	hardware/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex
	hardware/avr/cores/arduino/Arduino.h
	hardware/avr/cores/arduino/HardwareSerial.cpp
	hardware/avr/cores/arduino/HardwareSerial.h
	hardware/avr/cores/arduino/Print.cpp
	hardware/avr/cores/arduino/Print.h
	hardware/avr/cores/arduino/Stream.h
	hardware/avr/cores/arduino/WCharacter.h
	hardware/avr/cores/arduino/WInterrupts.c
	hardware/avr/cores/arduino/WMath.cpp
	hardware/avr/cores/arduino/WString.cpp
	hardware/avr/cores/arduino/WString.h
	hardware/avr/cores/arduino/main.cpp
	hardware/avr/cores/arduino/wiring.c
	hardware/avr/cores/arduino/wiring_analog.c
	hardware/avr/cores/arduino/wiring_digital.c
	hardware/avr/cores/arduino/wiring_private.h
	hardware/avr/cores/arduino/wiring_pulse.c
	hardware/avr/cores/arduino/wiring_shift.c
	hardware/avr/firmwares/MEGA-dfu_and_usbserial_combined.hex
	hardware/avr/firmwares/README.txt
	hardware/avr/firmwares/UNO-dfu_and_usbserial_combined.hex
	hardware/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.c
	hardware/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.h
	hardware/avr/firmwares/arduino-usbdfu/Board/LEDs.h
	hardware/avr/firmwares/arduino-usbdfu/Descriptors.c
	hardware/avr/firmwares/arduino-usbdfu/Descriptors.h
	hardware/avr/firmwares/arduino-usbdfu/makefile
	hardware/avr/firmwares/arduino-usbdfu/readme.txt
	hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex
	hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex
	hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial.c
	hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial.h
	hardware/avr/firmwares/arduino-usbserial/Board/LEDs.h
	hardware/avr/firmwares/arduino-usbserial/Descriptors.c
	hardware/avr/firmwares/arduino-usbserial/Descriptors.h
	hardware/avr/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h
	hardware/avr/firmwares/arduino-usbserial/makefile
	hardware/avr/firmwares/arduino-usbserial/readme.txt
	hardware/avr/libraries/EEPROM/EEPROM.cpp
	hardware/avr/libraries/EEPROM/EEPROM.h
	hardware/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
	hardware/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
	hardware/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
	hardware/avr/libraries/EEPROM/keywords.txt
	hardware/avr/libraries/Ethernet/Client.cpp
	hardware/avr/libraries/Ethernet/Client.h
	hardware/avr/libraries/Ethernet/Dhcp.cpp
	hardware/avr/libraries/Ethernet/Dhcp.h
	hardware/avr/libraries/Ethernet/Dns.cpp
	hardware/avr/libraries/Ethernet/Dns.h
	hardware/avr/libraries/Ethernet/Ethernet.cpp
	hardware/avr/libraries/Ethernet/Ethernet.h
	hardware/avr/libraries/Ethernet/IPAddress.cpp
	hardware/avr/libraries/Ethernet/IPAddress.h
	hardware/avr/libraries/Ethernet/Server.cpp
	hardware/avr/libraries/Ethernet/Server.h
	hardware/avr/libraries/Ethernet/Udp.cpp
	hardware/avr/libraries/Ethernet/Udp.h
	hardware/avr/libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.pde
	hardware/avr/libraries/Ethernet/examples/ChatServer/ChatServer.pde
	hardware/avr/libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.pde
	hardware/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.pde
	hardware/avr/libraries/Ethernet/examples/PachubeClient/PachubeClient.pde
	hardware/avr/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.pde
	hardware/avr/libraries/Ethernet/examples/TelnetClient/TelnetClient.pde
	hardware/avr/libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.pde
	hardware/avr/libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.pde
	hardware/avr/libraries/Ethernet/examples/WebClient/WebClient.pde
	hardware/avr/libraries/Ethernet/examples/WebServer/WebServer.pde
	hardware/avr/libraries/Ethernet/keywords.txt
	hardware/avr/libraries/Ethernet/util.h
	hardware/avr/libraries/Ethernet/utility/socket.cpp
	hardware/avr/libraries/Ethernet/utility/socket.h
	hardware/avr/libraries/Ethernet/utility/w5100.cpp
	hardware/avr/libraries/Ethernet/utility/w5100.h
	hardware/avr/libraries/Firmata/Boards.h
	hardware/avr/libraries/Firmata/Firmata.cpp
	hardware/avr/libraries/Firmata/Firmata.h
	hardware/avr/libraries/Firmata/LICENSE.txt
	hardware/avr/libraries/Firmata/TODO.txt
	hardware/avr/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde
	hardware/avr/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde
	hardware/avr/libraries/Firmata/examples/AnalogFirmata/Makefile
	hardware/avr/libraries/Firmata/examples/EchoString/EchoString.pde
	hardware/avr/libraries/Firmata/examples/EchoString/Makefile
	hardware/avr/libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde
	hardware/avr/libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt
	hardware/avr/libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.pde
	hardware/avr/libraries/Firmata/examples/ServoFirmata/Makefile
	hardware/avr/libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde
	hardware/avr/libraries/Firmata/examples/SimpleAnalogFirmata/Makefile
	hardware/avr/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde
	hardware/avr/libraries/Firmata/examples/SimpleDigitalFirmata/Makefile
	hardware/avr/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde
	hardware/avr/libraries/Firmata/examples/StandardFirmata/LICENSE.txt
	hardware/avr/libraries/Firmata/examples/StandardFirmata/Makefile
	hardware/avr/libraries/Firmata/examples/StandardFirmata/StandardFirmata.pde
	hardware/avr/libraries/Firmata/examples/StandardFirmata_2_2_forUNO_0_3/StandardFirmata_2_2_forUNO_0_3.pde
	hardware/avr/libraries/Firmata/keywords.txt
	hardware/avr/libraries/SD/File.cpp
	hardware/avr/libraries/SD/README.txt
	hardware/avr/libraries/SD/SD.cpp
	hardware/avr/libraries/SD/SD.h
	hardware/avr/libraries/SD/examples/CardInfo/CardInfo.pde
	hardware/avr/libraries/SD/examples/Datalogger/Datalogger.pde
	hardware/avr/libraries/SD/examples/DumpFile/DumpFile.pde
	hardware/avr/libraries/SD/examples/Files/Files.pde
	hardware/avr/libraries/SD/examples/ReadWrite/ReadWrite.pde
	hardware/avr/libraries/SD/examples/listfiles/listfiles.pde
	hardware/avr/libraries/SD/keywords.txt
	hardware/avr/libraries/SD/utility/FatStructs.h
	hardware/avr/libraries/SD/utility/Sd2Card.cpp
	hardware/avr/libraries/SD/utility/Sd2Card.h
	hardware/avr/libraries/SD/utility/Sd2PinMap.h
	hardware/avr/libraries/SD/utility/SdFat.h
	hardware/avr/libraries/SD/utility/SdFatUtil.h
	hardware/avr/libraries/SD/utility/SdFatmainpage.h
	hardware/avr/libraries/SD/utility/SdFile.cpp
	hardware/avr/libraries/SD/utility/SdInfo.h
	hardware/avr/libraries/SD/utility/SdVolume.cpp
	hardware/avr/libraries/SPI/SPI.cpp
	hardware/avr/libraries/SPI/SPI.h
	hardware/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.pde
	hardware/avr/libraries/Servo/Servo.cpp
	hardware/avr/libraries/Servo/Servo.h
	hardware/avr/libraries/Servo/examples/Knob/Knob.pde
	hardware/avr/libraries/Servo/examples/Sweep/Sweep.pde
	hardware/avr/libraries/Servo/keywords.txt
	hardware/avr/libraries/SoftwareSerial/SoftwareSerial.cpp
	hardware/avr/libraries/SoftwareSerial/SoftwareSerial.h
	hardware/avr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	hardware/avr/libraries/SoftwareSerial/examples/TwoPortRXExample/TwoPortRXExample.pde
	hardware/avr/libraries/SoftwareSerial/icrmacros.h
	hardware/avr/libraries/SoftwareSerial/keywords.txt
	hardware/avr/libraries/Wire/Wire.cpp
	hardware/avr/libraries/Wire/Wire.h
	hardware/avr/libraries/Wire/utility/twi.c
	hardware/avr/libraries/Wire/utility/twi.h
	hardware/avr/programmers.txt
	hardware/avr/variants/mega/pins_arduino.h
	hardware/avr/variants/standard/pins_arduino.h
	hardware/sam/cores/sam/Tone.cpp.disabled
	hardware/sam/cores/sam/binary.h
	hardware/sam/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde
	hardware/sam/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde
	hardware/sam/libraries/SPI/keywords.txt
	hardware/sam/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
	hardware/sam/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
	hardware/sam/libraries/Wire/examples/master_reader/master_reader.pde
	hardware/sam/libraries/Wire/examples/master_writer/master_writer.pde
	hardware/sam/libraries/Wire/examples/slave_receiver/slave_receiver.pde
	hardware/sam/libraries/Wire/examples/slave_sender/slave_sender.pde
	hardware/sam/libraries/Wire/keywords.txt
	libraries/EEPROM/EEPROM.cpp
	libraries/EEPROM/EEPROM.h
	libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde
	libraries/EEPROM/examples/eeprom_read/eeprom_read.pde
	libraries/EEPROM/examples/eeprom_write/eeprom_write.pde
	libraries/EEPROM/keywords.txt
	libraries/Ethernet/Client.cpp
	libraries/Ethernet/Dhcp.cpp
	libraries/Ethernet/Dhcp.h
	libraries/Ethernet/Dns.cpp
	libraries/Ethernet/Dns.h
	libraries/Ethernet/Ethernet.cpp
	libraries/Ethernet/Ethernet.h
	libraries/Ethernet/IPAddress.cpp
	libraries/Ethernet/IPAddress.h
	libraries/Ethernet/Server.cpp
	libraries/Ethernet/Udp.cpp
	libraries/Ethernet/Udp.h
	libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.pde
	libraries/Ethernet/examples/ChatServer/ChatServer.pde
	libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.pde
	libraries/Ethernet/examples/DnsWebClient/DnsWebClient.pde
	libraries/Ethernet/examples/PachubeClient/PachubeClient.pde
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.pde
	libraries/Ethernet/examples/TelnetClient/TelnetClient.pde
	libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.pde
	libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.pde
	libraries/Ethernet/examples/WebClient/WebClient.pde
	libraries/Ethernet/examples/WebServer/WebServer.pde
	libraries/Ethernet/keywords.txt
	libraries/Ethernet/util.h
	libraries/Ethernet/utility/socket.cpp
	libraries/Ethernet/utility/socket.h
	libraries/Ethernet/utility/w5100.cpp
	libraries/Ethernet/utility/w5100.h
	libraries/Firmata/Boards.h
	libraries/Firmata/Firmata.cpp
	libraries/Firmata/Firmata.h
	libraries/Firmata/LICENSE.txt
	libraries/Firmata/TODO.txt
	libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde
	libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde
	libraries/Firmata/examples/EchoString/EchoString.pde
	libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde
	libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt
	libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.pde
	libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde
	libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde
	libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde
	libraries/Firmata/examples/StandardFirmata/LICENSE.txt
	libraries/Firmata/examples/StandardFirmata_2_2_forUNO_0_3/StandardFirmata_2_2_forUNO_0_3.pde
	libraries/Firmata/keywords.txt
	libraries/SD/File.cpp
	libraries/SD/README.txt
	libraries/SD/SD.cpp
	libraries/SD/SD.h
	libraries/SD/examples/CardInfo/CardInfo.pde
	libraries/SD/examples/Datalogger/Datalogger.pde
	libraries/SD/examples/DumpFile/DumpFile.pde
	libraries/SD/examples/Files/Files.pde
	libraries/SD/examples/ReadWrite/ReadWrite.pde
	libraries/SD/examples/listfiles/listfiles.pde
	libraries/SD/keywords.txt
	libraries/SD/utility/FatStructs.h
	libraries/SD/utility/Sd2Card.cpp
	libraries/SD/utility/Sd2Card.h
	libraries/SD/utility/Sd2PinMap.h
	libraries/SD/utility/SdFat.h
	libraries/SD/utility/SdFatUtil.h
	libraries/SD/utility/SdFatmainpage.h
	libraries/SD/utility/SdFile.cpp
	libraries/SD/utility/SdInfo.h
	libraries/SD/utility/SdVolume.cpp
	libraries/SPI/SPI.cpp
	libraries/SPI/SPI.h
	libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde
	libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.pde
	libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde
	libraries/SPI/keywords.txt
	libraries/Servo/Servo.cpp
	libraries/Servo/Servo.h
	libraries/Servo/examples/Knob/Knob.pde
	libraries/Servo/examples/Sweep/Sweep.pde
	libraries/Servo/keywords.txt
	libraries/SoftwareSerial/SoftwareSerial.cpp
	libraries/SoftwareSerial/SoftwareSerial.h
	libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	libraries/SoftwareSerial/keywords.txt
	libraries/Wire/Wire.cpp
	libraries/Wire/Wire.h
	libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde
	libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde
	libraries/Wire/examples/master_reader/master_reader.pde
	libraries/Wire/examples/master_writer/master_writer.pde
	libraries/Wire/examples/slave_receiver/slave_receiver.pde
	libraries/Wire/examples/slave_sender/slave_sender.pde
	libraries/Wire/keywords.txt
	libraries/Wire/utility/twi.c
	libraries/Wire/utility/twi.h
 2012-01-11 13:45:31 +01:00
David A. Mellis
33544fc3e6 Changing Mac OS X build to a .zip file (and adding OS name to archive). 
http://code.google.com/p/arduino/issues/detail?id=645
 2011-11-28 17:36:03 -05:00
Cristian Maglie
b853464da8 Fixed distribution build on MacOSX 2011-11-26 01:30:41 +01:00
David A. Mellis
1b4cd35e9d Updated to newer bossac (1.2 from 2011-10-23). 2011-11-02 11:00:53 -04:00
Zach Eveland
a6a59f1783 Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot" 
This reverts commit df9835efaf, reversing
changes made to ec45af8bfa.

Conflicts:

	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
 2011-10-27 11:45:13 -04:00
Zach Eveland
f2bd8a5394 Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot 
Conflicts:
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
 2011-10-27 11:41:02 -04:00