Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension

Browse Source

Conflicts:
	build/macosx/dist/tools-universal.zip
	build/windows/avr_tools.zip
	hardware/arduino/cores/arduino/HardwareSerial.cpp

...

This commit is contained in:

Zach Eveland

2011-09-05 12:53:45 -04:00

parent 3389d28e20 0c92f230b5

commit e24e9499cf

175 changed files with 630 additions and 4538 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/avr_tools.zip

Binary file not shown.