diff options
| author | Martino Facchin <m.facchin@arduino.cc> | 2015-03-05 12:33:35 +0100 |
|---|---|---|
| committer | Martino Facchin <m.facchin@arduino.cc> | 2015-03-05 12:33:35 +0100 |
| commit | 6b396732ca2948ad2a00532f27b0134f5edb4b23 (patch) | |
| tree | 59ae7f5a9f9917514d1bd8dca0a7516ef99138dd /libraries | |
| parent | 97fb130175f777a0d3e051f2bdd74c5e0795e470 (diff) | |
| parent | 5cbfcfbf076e641483fa629eee4ebda9afacb68f (diff) | |
Merge branch 'ide-1.5.x' into SoftwareSerial
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/SPI/SPI.cpp | 2 | ||||
| -rw-r--r-- | libraries/SPI/SPI.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp index 077b6a3..9e7a116 100644 --- a/libraries/SPI/SPI.cpp +++ b/libraries/SPI/SPI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 by Cristian Maglie <c.maglie@bug.st> + * Copyright (c) 2010 by Cristian Maglie <c.maglie@arduino.cc> * Copyright (c) 2014 by Paul Stoffregen <paul@pjrc.com> (Transaction API) * Copyright (c) 2014 by Matthijs Kooijman <matthijs@stdin.nl> (SPISettings AVR) * Copyright (c) 2014 by Andrew J. Kroll <xxxajk@gmail.com> (atomicity fixes) diff --git a/libraries/SPI/SPI.h b/libraries/SPI/SPI.h index cee618c..5206a09 100644 --- a/libraries/SPI/SPI.h +++ b/libraries/SPI/SPI.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 by Cristian Maglie <c.maglie@bug.st> + * Copyright (c) 2010 by Cristian Maglie <c.maglie@arduino.cc> * Copyright (c) 2014 by Paul Stoffregen <paul@pjrc.com> (Transaction API) * Copyright (c) 2014 by Matthijs Kooijman <matthijs@stdin.nl> (SPISettings AVR) * Copyright (c) 2014 by Andrew J. Kroll <xxxajk@gmail.com> (atomicity fixes) |