USB_Host_Shield_2.0/examples/Bluetooth
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
..
BTHID Merge branch 'master' into SPI 2015-03-03 18:56:59 +01:00
PS3BT Merge branch 'master' into SPI 2015-03-03 18:56:59 +01:00
PS3Multi Merge branch 'master' into SPI 2015-03-03 18:56:59 +01:00
PS3SPP Merge branch 'master' into SPI 2015-03-03 18:56:59 +01:00
PS4BT Merge branch 'master' into SPI 2015-03-03 18:56:59 +01:00
SPP Merge branch 'master' into SPI 2015-03-03 18:56:59 +01:00
SPPMulti Merge branch 'master' into SPI 2015-03-03 18:56:59 +01:00
Wii Merge branch 'master' into SPI 2015-03-03 18:56:59 +01:00
WiiIRCamera Merge branch 'master' into SPI 2015-03-03 18:56:59 +01:00
WiiMulti Merge branch 'master' into SPI 2015-03-03 18:56:59 +01:00
WiiUProController Merge branch 'master' into SPI 2015-03-03 18:56:59 +01:00