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
..
launch4j	Adding guihead.o and head.o from launch4j (these apparently have some custom modifications from Processing).	2009-09-07 16:42:14 +00:00
about.bmp	Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot"	2011-10-27 11:45:13 -04:00
application.ico	Updating application icon for Mac OS X and Windows. (Windows one is untested.)	2010-09-22 09:08:09 -04:00
config.xml	Reapplying Christian's regex patch.	2010-10-03 19:44:28 -04:00