Revert "Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot"

Browse Source

This reverts commit df9835efaf, reversing
changes made to ec45af8bfa.

Conflicts:

	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino

...

This commit is contained in:

Zach Eveland

2011-10-27 11:45:13 -04:00

parent f2bd8a5394

commit a6a59f1783

40 changed files with 1917 additions and 2221 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

build/windows/launcher/about.bmp

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 374 KiB After Width:  |  Height:  |  Size: 457 KiB