Cristian Maglie b868595a1e Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery ... Conflicts: app/src/processing/app/Preferences.java app/src/processing/app/debug/Uploader.java		2013-08-23 15:59:24 +02:00
..
arduino	Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery	2013-08-23 15:59:24 +02:00