Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension

Conflicts:
	build/macosx/dist/tools-universal.zip
	build/windows/avr_tools.zip
	hardware/arduino/cores/arduino/HardwareSerial.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/cores/arduino/Print.h b/cores/arduino/Print.h
index fce302e..8530b03 100755
--- a/cores/arduino/Print.h
+++ b/cores/arduino/Print.h
@@ -42,7 +42,7 @@ class Print
   public:
     Print() : write_error(0) {}
   
-    int writeError() { return write_error; }
+    int getWriteError() { return write_error; }
     void clearWriteError() { setWriteError(0); }
   
     virtual size_t write(uint8_t) = 0;