From f186488fc3fd2fe8865e8fe16316a47220a51199 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Fri, 13 Feb 2015 23:10:00 +0200
Subject: [PATCH] Updated `framework-arduino` AVR & SAM to 1.6 stable version

---
 HISTORY.rst                          | 1 +
 docs/platforms/atmelavr.rst          | 2 +-
 docs/platforms/creating_platform.rst | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index f0552192..2b1cb2af 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -21,6 +21,7 @@ Release History
   `ignore_libs <http://docs.platformio.org/en/latest/projectconf.html#ignore-libs>`_ option
 * Output compiled size and static memory usage with `platformio run <http://docs.platformio.org/en/latest/userguide/cmd_run.html>`__
   command (`issue #59 <https://github.com/ivankravets/platformio/issues/59>`_)
+* Updated `framework-arduino` AVR & SAM to 1.6 stable version
 * Fixed an issue with the libraries that are git repositories (`issue #49 <https://github.com/ivankravets/platformio/issues/49>`_)
 * Fixed handling of assembly files (`issue #58 <https://github.com/ivankravets/platformio/issues/58>`_)
 * Fixed compiling error if space is in user's folder (`issue #56 <https://github.com/ivankravets/platformio/issues/56>`_)
diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index fbd1cbc4..c94f5057 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -51,7 +51,7 @@ Frameworks
       - Name
       - Reference
     * - ``arduino``
-      - Arduino Wiring-based Framework (AVR Core, 1.5.x branch)
+      - Arduino Wiring-based Framework (AVR Core, 1.6 branch)
       - `Documentation <http://arduino.cc/en/Reference/HomePage>`_
 
 
diff --git a/docs/platforms/creating_platform.rst b/docs/platforms/creating_platform.rst
index f135c5ae..f894bf14 100644
--- a/docs/platforms/creating_platform.rst
+++ b/docs/platforms/creating_platform.rst
@@ -67,7 +67,7 @@ Packages
       - `Flash Programmer <http://www.ti.com/tool/lmflashprogrammer>`_
     * - ``framework-arduinoavr``
       - framework
-      - `Arduino Wiring-based Framework (AVR Core, 1.5.x branch) <http://arduino.cc/en/Reference/HomePage>`_
+      - `Arduino Wiring-based Framework (AVR Core, 1.6 branch) <http://arduino.cc/en/Reference/HomePage>`_
     * - ``framework-energiamsp430``
       - framework
       - `Energia Wiring-based Framework (MSP430 Core) <http://energia.nu/reference/>`_