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

9 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
15d07fa036 Splitting up programmer selection menu and burn bootloader menu item. 2010-12-17 19:58:40 -05:00
David A. Mellis
34579ae440 Initial sync with Processing 6406. Compiles and runs (on Mac OS X) but probably very buggy. 2010-04-21 01:58:57 +00:00
David A. Mellis
5f9cbf5bb1 Adding default target to the preferences. 2009-12-18 16:00:36 +00:00
David A. Mellis
2e26a2d994 Syncing with Processing 1.0.9 (revision 5766). 2009-10-22 00:56:16 +00:00
David A. Mellis
46f5a9f540 Defaulting to the standard Apple (Mac) menu bar at the top of the screen instead of the in-window menus that Processing uses. 2009-07-31 21:48:14 +00:00
David A. Mellis
df4f1629c4 Making things more Arduino-like (cont...) 2009-06-01 17:10:56 +00:00
David A. Mellis
22ed6cdb73 Importing Processing rev. 5503 (1.0.3). 2009-05-31 15:53:33 +00:00