rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity
5,273 Commits 7 Branches 93 Tags 2.9 GiB
cc0d3322d1
Commit Graph

667 Commits

Author SHA1 Message Date
Federico Fissore
df1b82ac20 CLI: library manager, man page updated 2015-04-09 15:34:34 +02:00
Federico Fissore
87e2e68b85 CLI: Board and Lib Manager, syntax change: --install-boards (plural) and arduino:avr:1.6.2 (with the arch, not the name of the selected platform) 2015-04-09 13:03:43 +02:00
Federico Fissore
9833de618d Boards and Library manager command line interface documentation 2015-04-09 10:48:44 +02:00
Federico Fissore
f155601c5e Update revisions.txt 2015-04-08 20:59:52 +02:00
Federico Fissore
bf6f0f400b Update revisions.txt 2015-04-07 17:37:52 +02:00
Federico Fissore
ca5f1d405e Merge pull request #2903 from mixania/patch-1 
Char now has the right KEYWORD
 2015-04-07 17:20:26 +02:00
Federico Fissore
8020c0d733 Restored old error message colour 2015-04-07 10:10:12 +02:00
Michael Braverman
681cdb9faf Char now has the right KEYWORD 
Before, char was assigned as a structure to **KEYWORD3**. It is not a structure so I assigned it to **LITERAL2** since it is a constant. 

Also renamed the DecrementCompound to its appropriate name.
 2015-04-04 01:01:14 -04:00
Federico Fissore
9d2034a3c2 Update revisions.txt 2015-04-02 11:41:57 +02:00
Federico Fissore
e45dcba6c9 Update revisions.txt 2015-04-02 09:55:22 +02:00
Federico Fissore
1b139caef1 Theme: darker green 2015-04-01 16:18:18 +02:00
Arturo Guadalupi
501333a8ef new theme 2015-04-01 16:11:59 +02:00
Federico Fissore
82b3269863 New splashscreen and about 2015-04-01 15:12:56 +02:00
Federico Fissore
a40415a7df Update revisions.txt 2015-04-01 09:53:35 +02:00
Federico Fissore
98f364ea38 Updated checksum for bundled packages (windows) 2015-03-30 19:55:14 +02:00
Federico Fissore
ea5155656a Starting 1.6.3 
Updated toolchains: linux statically compiled, added gcc lto plugin (disabled)
 2015-03-30 15:06:59 +02:00
Federico Fissore
5689fc7123 New splashscreen and about image 2015-03-30 14:59:07 +02:00
Federico Fissore
3788128385 Update revisions.txt 2015-03-28 13:42:51 +01:00
Federico Fissore
e98fed3e26 Closing release 1.6.2 2015-03-27 20:36:35 +01:00
Federico Fissore
25575741d4 Upgraded bundled tools and libs 2015-03-27 17:03:45 +01:00
Federico Fissore
74a8ccdeb4 Introducing bundled_library_index.json 2015-03-27 14:51:19 +01:00
Federico Fissore
5ff7b351d5 Added Galileo and Edison help files 2015-03-27 14:51:19 +01:00
Federico Fissore
28fe19509b Updated bundled core version 2015-03-27 14:51:15 +01:00
Federico Fissore
d050c4ee4a AVR bundle: by default the IDE is built bundled with the avr toolchain and cores 
By passing -Dlight_bundle=1 to ant, an light/empty IDE is built
 2015-03-27 14:51:13 +01:00
Martino Facchin
ae8549cfcb update revisions.txt and fix comments in Esplora library 2015-03-26 17:23:00 +01:00
Federico Fissore
41d5cad91e MacOSX: appbundler is now the upstream one, not our fork 2015-03-24 16:45:25 +01:00
Martino Facchin
948bf209fa Merge branch 'master' of https://github.com/arduino/Arduino 2015-03-24 14:56:39 +01:00
Martino Facchin
9141edcf5b update revisions.txt 2015-03-24 14:56:13 +01:00
Federico Fissore
6fa73cfc7d Update revisions.txt 2015-03-24 14:39:37 +01:00
Federico Fissore
ec1db8ca8a New splashscreen and about images 2015-03-17 10:49:16 +01:00
Federico Fissore
2a0bc2bfca Splashscreen 2015-03-13 10:39:18 +01:00
Federico Fissore
af3c2bd1f6 Update revision.txt 2015-03-13 09:43:01 +01:00
Federico Fissore
825f1e5706 Update revisions.txt 2015-03-12 09:17:00 +01:00
Federico Fissore
c46e667e7a Started working on 1.6.2 2015-03-11 11:42:55 +01:00
Federico Fissore
b8b2869753 Updated revisions.txt 2015-03-10 14:14:06 +01:00
Federico Fissore
25ddcb852f Update revision.txt 2015-03-10 08:52:05 +01:00
Martino Facchin
4fb33e9482 update revisions.txt 2015-03-09 16:49:49 +01:00
Federico Fissore
6f7164a162 Update revision.txt 2015-03-04 11:39:01 +01:00
Federico Fissore
e327bb091a MacOSX: better IDE 2015-03-03 15:48:20 +01:00
Federico Fissore
4380e2930e Updated revisions.txt 2015-03-02 16:41:19 +01:00
Cristian Maglie
606604d7d6 Update revision log. Version set to 1.6.1. 2015-02-19 18:22:43 +01:00
Cristian Maglie
fc825537fd Updated revision log 2015-02-08 19:49:27 +01:00
Cristian Maglie
c4cd447283 Updated offline docs 2015-02-08 19:49:27 +01:00
Cristian Maglie
7e568e21f4 Updated revision log. Version set to 1.6.0rc3 2015-02-03 12:12:09 +01:00
jogo-
351cfbbab1 Fix typos in BlinkWithoutDelay.ino 2015-01-28 23:11:51 +01:00
Cristian Maglie
379df90b30 Update revision log 2015-01-23 11:22:40 +01:00
Cristian Maglie
14fe427050 Updated revision log 2015-01-20 15:50:13 +01:00
Cristian Maglie
d2269ca89e Update revision log 2015-01-19 13:50:57 +01:00
Cristian Maglie
244a750bef Merge branch 'wayoda-fix-find-dialog-layout' into ide-1.5.x 2015-01-13 23:30:22 +01:00
Cristian Maglie
fdbb45ec47 update revision log 2015-01-13 23:28:19 +01:00
Cristian Maglie
91e6926cfc Merge commit 'collin80-uart-fix' into ide-1.5.x 2015-01-06 15:21:57 +01:00
Cristian Maglie
ab92e42259 Merge branch 'master' into ide-1.5.x 
Conflicts:
	app/src/processing/app/Serial.java
	app/src/processing/app/SerialMonitor.java
 2014-12-23 16:41:38 +01:00
Cristian Maglie
35848e09a8 Mitigated Serial Monitor resource exhaustion when the connected device sends a lot of data 
Fixes #2233
 2014-12-10 10:37:43 +01:00
Cristian Maglie
6c4f7dc293 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.h
 2014-12-02 22:35:17 +01:00
Cristian Maglie
ae402c2907 Update revision log 2014-12-02 22:20:40 +01:00
Arturo Guadalupi
060c1e766c Updated description 
It reads the state of a potentiometer (an analog input) and turns on an LED
 only if the LED goes above a certain threshold level. It prints the analog value
 regardless of the level.

updated to

 It reads the state of a potentiometer (an analog input) and turns on an LED
 only if the potentiometer goes above a certain threshold level. It prints the analog value
 regardless of the level.
 2014-11-24 09:37:20 +01:00
Cristian Maglie
7b45b18ae8 Merge branch 'ide-1.5.x-libastyle-2.05' of github.com:ffissore/Arduino into ide-1.5.x 2014-11-21 11:45:46 +01:00
Cristian Maglie
6aff4f4077 Merge branch 'ide-1.5.x-gui-refactor' into ide-1.5.x 2014-11-18 12:22:43 +01:00
Cristian Maglie
285a03a655 Merge branch 'autosave' into HEAD 2014-11-13 11:54:54 +01:00
Cristian Maglie
9a9fef808c Renamed preferences 'save.verifyUpload' to 'editor.save_on_verify' 2014-11-09 20:44:12 +01:00
Cristian Maglie
6ec9f5b23e Merge branch 'ide-1.5.x' of github.com:dpslwk/Arduino into dpslwk-ide-1.5.x 2014-11-07 18:07:38 +01:00
Cristian Maglie
52b685a7a5 Merge remote-tracking branch 'ide-1.5.x-avrdude' into ide-1.5.x 2014-11-05 19:49:53 +01:00
Cristian Maglie
b0d6f42755 Merge branch 'ide-1.5.x-lcd' of github.com:matthijskooijman/Arduino 2014-11-05 17:28:30 +01:00
Cristian Maglie
ca5e30a255 Fixed Robot_Control example R06_Wheel_Calibration 
Fixes #2217
 2014-11-05 15:18:50 +01:00
dpslwk
b8623a4338 (Mac OSX) Improve Quick look and syntax highlighting under OSX 
An exported UTI declaration means that the type is available for use by all other parties.
By adding an this declaration for ino files, it allows Quick Look to display file content and
external editors (like Xcode) to automatically syntax highlight .ino files as C++
 2014-11-04 14:24:18 +00:00
Cristian Maglie
b4f2af4f9d Merge remote-tracking branch 'ide-1.5.x-core.a-rebuild' into ide-1.5.x 2014-11-02 11:52:57 +01:00
Cristian Maglie
d1714a9fb8 [sam] Added -MMD flag to tell compiler to produce dependencies files 
Now a full rebuild of the sketch is triggered only if needed.
 2014-10-22 13:36:14 +02:00
Cristian Maglie
0824abfee5 Merge branch 'master' into ide-1.5.x 
Conflicts:
	hardware/arduino/cores/arduino/HardwareSerial.cpp
	hardware/arduino/cores/robot/Arduino.h
 2014-10-21 17:47:59 +02:00
Cristian Maglie
54a6d644b6 Updated revision log 2014-10-21 17:40:48 +02:00
Cristian Maglie
58b6fd4789 Fixed missing NOT_AN_INTERRUPT constant in digitalPinToInterrupt() 
Fixes #2379
 2014-10-21 16:55:37 +02:00
Cristian Maglie
2a912bab62 Merge branch 'master' into ide-1.5.x 
Conflicts:
	app/src/processing/app/Base.java
 2014-10-10 00:14:22 +02:00
Cristian Maglie
ed5ad426dd Upped version to 1.0.7. Update revision log. 2014-10-10 00:08:41 +02:00
Cristian Maglie
afc368b01f GSM: Backported library from IDE 1.5.x 
Fixes #2343
 2014-10-10 00:02:18 +02:00
Cristian Maglie
3a1b7ea362 Merge branch 'master' into ide-1.5.x. Updated revision log. 
Conflicts:
	build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
	hardware/arduino/boards.txt
 2014-10-01 13:59:32 +02:00
Robert Allen
d3f76e9558 Fix typo in KeyboardLogout.ino 
Comment says ALT+s, code says ALT+l. This remedies that difference.
 2014-09-26 12:51:10 -07:00
Cristian Maglie
0d86acc274 Update revision log 2014-09-20 19:47:29 +02:00
Cristian Maglie
7531a3571d update revision log 2014-09-16 12:53:46 +02:00
Cristian Maglie
84518e442c Fixed attribution rights for SAM delayMicroseconds function 2014-09-16 12:31:16 +02:00
Cristian Maglie
44bcd2040b Merge branch 'master' into ide-1.5.x 
Conflicts:
	app/src/processing/app/Base.java
	build/build.xml
	todo.txt
 2014-09-16 12:19:39 +02:00
Cristian Maglie
90bd172f30 Updated revision log. Version upped to 1.0.6. 2014-09-16 12:16:06 +02:00
Cristian Maglie
ec1310e1bd Removed --no-op from CLI. Preferences now not-saved by default. 
See https://github.com/arduino/Arduino/pull/2000 for details.

Close #2000
 2014-08-22 15:39:33 +02:00
Matthijs Kooijman
cc773fb1e0 Take into account --curdir for all relative paths 
In a lot of places, (potentially) relative paths were passed to File
without any processing, making them be resolved without taking into
account --curdir. By passing them through Base.absoluteFile instead,
these paths are resolved relative to the working directory before
starting arduino (at least on Linux, which is currently the only
platform supporting --curdir).

This applies --curdir to the --preferences-file option and the
build.path, settings.path, sketchbook.path preferences.

For example, this now works as expected:

  arduino --pref build.path=build_dir --verify Blink.ino
 2014-08-19 09:16:49 +02:00
Matthijs Kooijman
e494f39255 Add --get-pref option 
This allows reading specific preferences from the commandline.
 2014-08-19 09:16:47 +02:00
Matthijs Kooijman
f745fff50b Add --noop option 
This option causes the IDE to process its commandline arguments and then
quit. This allows setting preferences uses --pref, without having to
also load the GUI or compile a sketch.
 2014-08-19 09:16:47 +02:00
Matthijs Kooijman
4452eb3850 Add --no-save-prefs option 
This allows setting preferences for the current run only, without
remembering them for the next run. This is especially useful when
combined with --verify or --upload.
 2014-08-19 09:16:47 +02:00
Matthijs Kooijman
e0c599d733 Error when passing --verbose without --verify or --upload 
Since the handling of these options defaults to non-verbose (instead of
the current preference), they make no sense when starting the IDE
normally. Previously, these options would just be ignored in this case,
now an error is shown.
 2014-08-19 09:16:47 +02:00
Matthijs Kooijman
d3e2208c01 Process some commandline arguments earlier 
Previously, the --board and --port arguments were stored in a variable
first and only processed later. Now, the arguments are processed right
away.

This does mean that the arguments are processed when the GUI is not yet
initialized, which caused problems with calling onBoardOrPortChange and
friends from selectBoard. However, since the GUI is not initialized,
there is no real reason to call them either - if we just set the
preferences to the right values, the GUI will be initialized correctly
later. For this reason, selectBoard no longer calls the GUI update
methods. Instead, those are called from the GUI code when the board is
changed through the menu instead (e.g., after calling selectBoard).

This commit slightly changes behaviour. Previously, --board and --port
only worked in combination with --verify and --upload, but were ignored
when just starting the IDE. Now, these are processed regardless of the
other options present.

Additionally, this commit causes all changed preferences to be saved.
Previously, only changes with --pref were saved, --board and --port
options were only active for the current run. This was caused because
the saving of the preferences happened as a side effect of loading the
file in the Editor, but only the --pref option was processed at that
time.

Note that the --verbose options are still only active for the current
run and are only valid combined with --verify or --upload (since they
default to non-verbose instead of the current preference).
 2014-08-19 09:16:47 +02:00
Matthijs Kooijman
7301b37c7e Added history section to the manpage 
This describes the versions where various options were introduced or
changed.
 2014-08-19 09:16:46 +02:00
Matthijs Kooijman
26ac897598 Fix indentation in the manpage 2014-08-19 09:16:46 +02:00
Cristian Maglie
7f2350f714 Merge branch 'master' into ide-1.5.x 2014-08-08 15:44:41 +02:00
Christopher Andrews
1bbcb2f9d4 Added replacement stub for cstdlib atexit() funciton. 
This is an empty stub to simply allow use of complex types with a
non global static lifetime. For more complex handling the function
'atexit' can be redefined in user code.

For more information see:

https://github.com/arduino/Arduino/pull/2229
https://github.com/arduino/Arduino/issues/1919
 2014-08-08 15:38:57 +02:00
Cristian Maglie
60f8a897ed Updated revision log 2014-08-08 14:35:39 +02:00
Cristian Maglie
8ae1d36a00 Update revision log 2014-08-06 10:21:30 +02:00
Cristian Maglie
66c6d49325 Merge branch 'find-replace-fixes' into ide-1.5.x 2014-07-25 12:36:46 +02:00
Cristian Maglie
8131af93dd Fixed wrong return value in FileIO::size() 
Fixes #2203
 2014-07-24 12:19:13 +02:00
PaulStoffregen
33cec73f26 Add availableForWrite() to HardwareSerial 2014-07-18 07:01:26 -07:00
Cristian Maglie
5de6192dae Updated revision log 2014-07-06 01:41:54 +02:00
Cristian Maglie
807f509a6e Updated revision log 2014-07-04 18:25:17 +02:00
Cristian Maglie
f9cdc5ea00 Update revision log 2014-07-02 16:10:07 +02:00
Cristian Maglie
1a7a921f14 Merge branch 'master' into HEAD 
Conflicts:
	build/shared/examples/03.Analog/Smoothing/Smoothing.ino
 2014-07-02 16:05:23 +02:00
Cristian Maglie
faa08454cd Fixed Smoothing example 
"index" variable name create conflicts with Arduino Due where "index" is
a reserved word for Posix C.
 2014-07-02 15:44:26 +02:00
Cristian Maglie
5f1173e7e3 Update revision log 2014-07-02 15:04:33 +02:00
Fede85
8e48cef584 added support for the ArduinoISP 2014-07-02 15:03:12 +02:00
Cristian Maglie
81a5352811 Merge branch 'master' into ide-1.5.x 2014-07-01 19:07:55 +02:00
Cristian Maglie
494d3de97d Fixed permission on wifishield upgrade script. 2014-07-01 19:05:03 +02:00
Cristian Maglie
c2c122b079 Merge branch 'master' into matthijskooijman-ide-1.5.x-timer-variant 
Conflicts:
	app/src/processing/app/debug/Compiler.java
	hardware/arduino/sam/cores/arduino/main.cpp
 2014-07-01 18:34:46 +02:00
Cristian Maglie
668559fc6f Updated revision log 2014-07-01 18:27:03 +02:00
Cristian Maglie
3332d28e54 Merge branch 'master' into ide-1.5.x 2014-06-30 18:26:56 +02:00
Cristian Maglie
f73209728d Updated revision log 2014-06-30 18:24:42 +02:00
Cristian Maglie
d52e75ff38 Merge branch 'osx-app-bundler' into ide-1.5.x 
Conflicts:
	build/build.xml
 2014-06-27 16:08:20 +02:00
Cristian Maglie
403c96f1cc Merge remote-tracking branch 'arduino/master' into ide-1.5.x 2014-06-27 13:53:26 +02:00
Cristian Maglie
370648a532 Merge branch 'ide-1.5.7' into ide-1.5.x 2014-06-27 13:44:18 +02:00
Cristian Maglie
a798c79dab Updates to revision log 2014-06-25 16:02:00 +02:00
Cristian Maglie
c2e5f67ea6 Updated arm gcc to version 4.8.3-2014q1 2014-06-25 11:59:47 +02:00
Cristian Maglie
4df2c8982a Updated arm gcc to 4.8.3 2014-06-25 11:57:49 +02:00
Cristian Maglie
3a4381955e Updated arm gcc to 4.7.4 2014-06-25 11:56:50 +02:00
Cristian Maglie
6b5a99b7b5 Version bumped to 1.5.7. Updated revision log. 2014-06-25 11:21:15 +02:00
Federico Fissore
c387f87329 Corrected typos: Yun -> Yún 2014-05-30 12:17:09 +02:00
Cristian Maglie
5d92c1ba8e Merge remote-tracking branch 'arduino/master' into ide-1.5.x 
Conflicts:
	build/shared/examples/01.Basics/Blink/Blink.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/10.StarterKit/p02_SpaceshipInterface/p02_SpaceshipInterface.ino
	hardware/arduino/cores/arduino/HardwareSerial.cpp
 2014-05-23 21:04:47 +02:00
Federico Fissore
c12e24a826 Updated revisions.txt 2014-05-14 09:12:59 +02:00
Scott Fitzgerald
9ad8748d40 Updated Blink 
removed the variable “led” and added some additional descriptive text
 2014-05-08 23:05:53 +04:00
Scott Fitzgerald
cf5fc143ac Modified Keyboard Reprogram example 
Updated to reflect changes with how the IDE creates new blank sketches.
 2014-05-03 19:16:29 +04:00
Jaime Iniesta
9403021460 fix comments on spaceship example 
The comments explaining the if..else part were mistaken.
 2014-05-01 22:22:04 +02:00
Cristian Maglie
06d75a4fa6 Merge branch 'master' into ide-1.5.x 2014-04-07 19:14:13 +02:00
Cristian Maglie
9c7e3ab4c3 Fixed example StringStartsWithEndsWith.ino 2014-04-07 19:07:49 +02:00
Federico Fissore
f3ca136cd9 Removed useless hidden files 
Updated .gitignore
Closes #996
 2014-02-27 14:21:48 +01:00
Federico Fissore
79eb32f816 Fixed NPE when RXCHAR event with no bytes. Closes #1885 2014-02-21 11:14:30 +01:00
Cristian Maglie
c39a6a26da Update revision log 2014-02-20 14:52:01 +01:00
Cristian Maglie
2659b47587 Update revision log. Upped version to 1.5.6 2014-02-19 18:14:31 +01:00
Cristian Maglie
9fcf005638 [sam] Removed workaround in banzai() subroutine after 8120558af5 
See #1876
 2014-02-18 22:32:55 +01:00
Cristian Maglie
d60f1df996 Added command line option --verbose-build and --verbose-upload 2014-02-10 12:55:16 +01:00
Cristian Maglie
793b139d39 Merge remote-tracking branch 'arduino/master' into ide-1.5.x 2014-02-05 15:58:30 +01:00
Scott Fitzgerald
017326acc6 Minor changes to Communication Examples 
Added a note to the included Processing sketches about replacing
println(Serial.list()) with Serial.printArray() if using Processing 2.1
or later
 2014-01-29 14:27:09 +04:00
Cristian Maglie
bcfa1a7479 Updated revision log 2014-01-28 18:33:08 +01:00
Cristian Maglie
48c1223762 Update to jssc 2.8.0 
Fixes #1811
 2014-01-27 16:06:55 +01:00
Cristian Maglie
f876733491 Updated manpage 2014-01-25 23:29:35 +01:00
Cristian Maglie
c2e9860cff Merge remote-tracking branch 'matthijs/ide-1.5.x-ipaddress-const' into ide-1.5.x 2014-01-16 13:17:44 +01:00
Cristian Maglie
63e33be342 Merge tag '1.5.5-r2' into ide-1.5.x 
Conflicts:
	build/shared/revisions.txt
	build/windows/dist/drivers/arduino.cat
 2014-01-10 19:12:33 +01:00
Cristian Maglie
3d46d58b9f Signed drivers for Windows 8.1 
Merge tag '1.0.5-r2' into HEAD

Conflicts:
	build/shared/revisions.txt
	build/windows/dist/drivers/arduino.cat
 2014-01-10 19:10:27 +01:00
Cristian Maglie
2491c16d77 Merge branch 'lib-1.5-rev2' into HEAD 2014-01-09 14:56:23 +01:00
Cristian Maglie
711fe3d91a Merge tag '1.0.5-r2' into HEAD 2014-01-08 16:59:18 +01:00
Cristian Maglie
e9c72c9278 Signed drivers for Windows 8.1 2014-01-08 16:58:32 +01:00
Cristian Maglie
c2498aac5f Updated revisions log 2014-01-08 13:47:40 +01:00
Cristian Maglie
673847c8b6 Improved portability of String class (maniacbug) 2014-01-01 17:22:40 +01:00
Cristian Maglie
825d8c8455 sam: Optimized delayMicroseconds() (Rob Tillaart) 
See #1121
 2013-12-30 12:17:50 +01:00
Cristian Maglie
660c7d86fd Optimized Print::print(String&) (part 2) 2013-12-23 12:04:15 +01:00
Cristian Maglie
b530742603 [sam] Fixed regression in analogRead() (fails to read multiple channels) (Mark Tillotson) 
See #1740 #1634

http://forum.arduino.cc/index.php?topic=203322.msg1509907#msg1509907
 2013-12-18 15:46:42 +01:00
Cristian Maglie
a1c4809105 [sam] Fixed regression in analogRead() (fails to read multiple channels) 
Fixes #1740
 2013-12-16 11:07:45 +01:00
Cristian Maglie
2e7b645571 [sam] Fixed wrap-around bug in delay() (Mark Tillotson) 
Fixes #1736
 2013-12-14 00:33:57 +01:00
Cristian Maglie
d20c028469 Merge remote-tracking branch 'arduino/master' into ide-1.5.x 
Conflicts:
	libraries/Ethernet/EthernetClient.cpp
 2013-12-09 18:31:43 +01:00