|
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 |
|