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

Conflicts:
	build/linux/dist/tools/avrdude.conf

1 files changed, 0 insertions, 10 deletions

diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp
index 8190d4f..500de8c 100755
--- a/cores/arduino/Print.cpp
+++ b/cores/arduino/Print.cpp
@@ -30,16 +30,6 @@
 // Public Methods //////////////////////////////////////////////////////////////
 
 /* default implementation: may be overridden */
-size_t Print::write(const char *str)
-{
-  size_t n = 0;
-  while (*str) {
-    n += write(*str++);
-  }
-  return n;
-}
-
-/* default implementation: may be overridden */
 size_t Print::write(const uint8_t *buffer, size_t size)
 {
   size_t n = 0;