Merge branch 'master' into matthijskooijman-ide-1.5.x-timer-variant

Browse Source

Conflicts:
	app/src/processing/app/debug/Compiler.java
	hardware/arduino/sam/cores/arduino/main.cpp

...

This commit is contained in:

Cristian Maglie 2014-07-01 18:34:46 +02:00

parent 08f1010230 452cab0593

commit 5c9f875c3f

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