4 Commits

Author	SHA1	Message	Date
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
David A. Mellis	896b1a48a1	Revert "Merge branch 'new-extension' of git@github.com:arduino/Arduino" ... This reverts commit 42fa932ceb, reversing changes made to a7352b894f. See: http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt for information on how to merge the branch in later.	2011-02-25 18:23:34 -05:00
David A. Mellis	43092293ec	New document icons for new file extension.	2010-11-09 12:31:53 -05:00
David A. Mellis	c4760d8ae7	Moving to ant-based build system from Processing. Mac OS X seems to work (for the moment).	2010-05-08 21:47:19 +00:00