-
-
Notifications
You must be signed in to change notification settings - Fork 49
Commit 5b96486
Merge branch 'master' into ide-1.5.x
Conflicts:
hardware/arduino/cores/arduino/wiring.c
libraries/Ethernet/src/utility/util.h
libraries/Ethernet/src/utility/w5100.cpp
libraries/Ethernet/src/utility/w5100.h
libraries/Ethernet/util.h
libraries/Ethernet/utility/util.h
libraries/SPI/SPI.cpp
libraries/SPI/SPI.hFile tree
1 file changed
+1
-1
lines changed- examples/05.Control/IfStatementConditional
1 file changed
+1
-1
lines changedLines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
6 | - | ||
6 | + | ||
7 | 7 |
| |
8 | 8 |
| |
9 | 9 |
| |
|
0 commit comments