Federico Fissore 21ccdd0a96 Merge branch 'ide-1.5.x-discovery' into dev-ide-1.5.x-discovery		2013-07-07 17:07:32 +02:00
..
avr	Merge branch 'ide-1.5.x-discovery' into dev-ide-1.5.x-discovery	2013-07-07 17:07:32 +02:00
sam	Merge remote-tracking branch 'arduino/ide-1.5.x' into dev-ide-1.5.x-discovery	2013-06-28 15:36:50 +02:00