1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-05 16:24:12 +01:00
Commit Graph

5 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
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