Commit Graph

5 Commits

Author SHA1 Message Date
Cristian Maglie 9dcbfd47e1 Merge branch 'master' into ide-1.5.x
Conflicts:
	libraries/RobotIRremote/examples/IRrecord/IRrecord.ino
	libraries/RobotIRremote/examples/IRrecvDump/IRrecvDump.ino
	libraries/RobotIRremote/examples/IRrelay/IRrelay.ino
	libraries/RobotIRremote/examples/IRtest/IRtest.ino
	libraries/RobotIRremote/examples/IRtest2/IRtest2.ino
	libraries/RobotIRremote/examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
	libraries/Robot_Control/examples/explore/R10_Rescue/R10_Rescue.ino
2013-11-14 16:04:45 +01:00
Xun Yang 4cb0b11405 Fix robot problems regarding new version of Arduino 2013-11-04 20:17:04 +01:00
Federico Fissore b4c68b3dff Run new astyle formatter against all the examples 2013-10-21 09:58:40 +02:00
Fede85 876211ae8d RobotIRremote library to the new format 2013-09-10 17:30:58 +02:00
Xun Yang ec31a2ee5c Fixed robot libraries and examples for unified Arduino core 2013-08-21 23:14:00 +02:00