Cristian Maglie d4fe0a13b6 Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery ... Conflicts: build/shared/revisions.txt		2013-09-10 12:10:57 +02:00
..
arduino	Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery	2013-09-10 12:10:57 +02:00
tools	Removed unused boards/programmers	2012-08-25 16:31:25 +02:00