1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10: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
80bb16db8c Adding new SoftwareSerial (NewSoftSerial by Mikal Hart). 2011-01-09 12:45:46 -05:00
David A. Mellis
e816ffb0b6 Removing SoftwareSerial (to replace it with NewSoftSerial). 2011-01-09 12:44:52 -05:00
David A. Mellis
3075c8e4fd Moving libraries out of arduino platform / core directory and to top-level. 2009-11-07 17:54:56 +00:00