Cristian Maglie 738b9d8e29 Merge remote-tracking branch 'arduino/master' into ide-1.5.x ... Conflicts: .gitignore app/lib/commons-logging-1.0.4.jar build/build.xml build/windows/launcher/config_debug.xml libraries/Esplora/examples/Beginners/EsploraJoystickMouse/EsploraJoystickMouse.ino		2014-03-16 12:11:19 +01:00
..
examples	Merge remote-tracking branch 'arduino/master' into ide-1.5.x	2014-03-16 12:11:19 +01:00
src	Esplora library to new format	2013-07-04 15:54:30 +02:00
keywords.txt	Esplora library to new format	2013-07-04 15:54:30 +02:00
library.properties	Updated all library.properties to 1.5 rev2 lib format	2014-02-18 22:32:24 +01:00