Cristian Maglie 008818868c Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery ... Conflicts: app/src/cc/arduino/packages/uploaders/SerialUploader.java app/src/processing/app/Editor.java app/src/processing/app/Sketch.java app/src/processing/app/debug/Uploader.java		2013-07-14 12:01:03 +02:00
..
bootloaders	updated Yun bootloader	2013-06-21 17:40:59 +02:00
cores	Refactored YunClient and YunServer classes.	2013-07-04 17:15:52 +02:00
firmwares	Merged 1.0.5	2013-04-03 13:51:04 +02:00
libraries	Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery	2013-07-14 12:01:03 +02:00
variants	Merged 1.0.5	2013-05-29 18:30:36 +02:00
boards.txt	HTTPUploader is now SSHUploader	2013-06-13 13:01:21 +02:00
platform.txt	assembly compile recipe is missing (C. A. Church)	2013-07-12 21:09:45 +02:00
programmers.txt	Set correct speed of Arduino ISP programmer	2013-04-06 01:59:25 +02:00