aboutsummaryrefslogtreecommitdiff
path: root/libraries/Wire/keywords.txt
diff options
context:
space:
mode:
authorCristian Maglie <c.maglie@bug.st>2013-07-30 10:45:44 +0200
committerCristian Maglie <c.maglie@bug.st>2013-07-30 10:45:44 +0200
commitacb3df6d4398e1df2e350cd5e8f1d742bee97316 (patch)
treee5e17a3863fbc97e6d4d93254670a9924df67c86 /libraries/Wire/keywords.txt
parent1895d696b1fd11488e469fb17549263c24548d0d (diff)
parent99bb4a573fa71a4e6c30cad144284d12b3f7edd0 (diff)
Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts: hardware/arduino/avr/cores/arduino/USBCore.cpp
Diffstat (limited to 'libraries/Wire/keywords.txt')
0 files changed, 0 insertions, 0 deletions