Merge branch 'master' into ide-1.5.x

Browse Source

Conflicts:
	build/windows/dist/drivers/arduino.cat

...

This commit is contained in:

Cristian Maglie 2014-01-07 11:19:08 +01:00

parent 618f537691 144b5e8815

commit e50b0ec030

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

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

Diff Content Not Available