Commit graph

5 commits

Author SHA1 Message Date
Kristian Sloth Lauszus c39e8a180c Merge branch 'master' into SPI
Conflicts:
	examples/Bluetooth/SPPMulti/SPPMulti.ino
	examples/adk/ArduinoBlinkLED/ArduinoBlinkLED.ino
	settings.h
	usbhost.h
2015-03-03 18:56:59 +01:00
Andrew J. Kroll 196a0b69be Fix all demos, fix all wrong uses of virtual keyword, some spacing cleanup. 2014-11-10 01:35:13 -05:00
Kristian Lauszus 7d3154bce7 Work around Arduino IDE bug
See: https://github.com/arduino/Arduino/pull/1726
2014-08-02 18:57:37 -04:00
Kristian Lauszus e92dd0d03d Typo 2013-12-08 17:42:14 +01:00
Kristian Lauszus 8072e6f1bb Added max_LCD example
Copy of: https://github.com/arduino/Arduino/blob/ide-1.5.x/libraries/LiquidCrystal/examples/HelloWorld/HelloWorld.ino
2013-12-07 00:34:33 +01:00