1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Arduino/build/macosx
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
..
dist Fixing a bug in Mac eeprom.h (that appears on ATtiny's). 2011-09-28 17:21:59 -04:00
template.app/Contents Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 2011-10-27 09:32:27 -04:00
mkdmg Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00
template.dmg.gz Updating FTDI drivers on Mac OS X (to 2.2.16 from 28 February 2011). 2011-05-13 11:08:59 -04:00