Zach Eveland
a6a59f1783
Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot"
...
This reverts commit df9835efafd13685251749bc210c0b96a18a96a5, reversing
changes made to ec45af8bfa9222a807c075dd1db4b5aa798bba03.
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 42fa932cebb23b62bece52392548f6526fc4d563, reversing
changes made to a7352b894f258c7b2e8087d735f1a4aa8e765ea0.
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
299b779ca2
Updating colors, toolbar icon, and about image.
2010-11-10 10:43:46 -05:00
David A. Mellis
950d0d4c00
Switching theme colors and images to the old Arduino blue ones. On the plus side, the new theme setup should make it easier to have different colors in different releases (i.e. improve the color scheme).
2009-06-13 13:43:48 +00:00
David A. Mellis
22ed6cdb73
Importing Processing rev. 5503 (1.0.3).
2009-05-31 15:53:33 +00:00
