Cristian Maglie b4852f353c Merge remote-tracking branch 'dog/ide-1.5.x-discovery' into ide-1.5.x-discovery ...

Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java

2013-06-04 19:33:38 +02:00

..

bootloaders

Merge branch 'merge-1.0.5' into ide-1.5.x-discovery

2013-06-01 23:16:02 +02:00

cores

Merge branch 'merge-1.0.5' into ide-1.5.x-discovery

2013-06-01 23:16:02 +02:00

firmwares

Merged 1.0.5

2013-04-03 13:51:04 +02:00

libraries

Merge remote-tracking branch 'dog/ide-1.5.x-discovery' into ide-1.5.x-discovery

2013-06-04 19:33:38 +02:00

variants

Merged 1.0.5

2013-05-29 18:30:36 +02:00

boards.txt

Merge branch 'merge-1.0.5' into ide-1.5.x-discovery

2013-06-01 23:16:02 +02:00

platform.txt

Detect RAM usage and stop if full

2013-04-22 17:48:22 -07:00

programmers.txt

Set correct speed of Arduino ISP programmer

2013-04-06 01:59:25 +02:00