From 18b4497be79944c4937089cd090df0a262ea7613 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 3 Jun 2015 19:53:00 +0300
Subject: [PATCH 1/2] Add info about Silicon Labs EFM32 platform

---
 README.rst             | 4 +++-
 docs/index.rst         | 5 +++--
 platformio/__init__.py | 6 +++---
 setup.py               | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index 9f2fca1c..b3129c0b 100644
--- a/README.rst
+++ b/README.rst
@@ -37,7 +37,8 @@ PlatformIO
 `Twitter <https://twitter.com/PlatformIO_Org>`_
 
 *Atmel AVR & SAM, Espressif, Freescale Kinetis, Nordic nRF51, NXP LPC,
-ST STM32, TI MSP430 & Tiva, Teensy, Arduino, mbed, libOpenCM3, etc.*
+Silicon Labs EFM32, ST STM32, TI MSP430 & Tiva, Teensy, Arduino, mbed,
+libOpenCM3, etc.*
 
 .. image:: https://raw.githubusercontent.com/platformio/platformio/develop/docs/_static/platformio-logo.png
     :target: http://platformio.org
@@ -142,6 +143,7 @@ It has support for the most popular embedded platforms:
 * `Nordic nRF51 <http://platformio.org/#!/platforms/nordicnrf51>`_
 * `NXP LPC <http://platformio.org/#!/platforms/nxplpc>`_
 * `ST STM32 <http://platformio.org/#!/platforms/ststm32>`_
+* `Silicon Labs EFM32 <http://platformio.org/#!/platforms/siliconlabsefm32>`_
 * `Teensy <http://platformio.org/#!/platforms/teensy>`_
 * `TI MSP430 <http://platformio.org/#!/platforms/timsp430>`_
 * `TI TIVA C <http://platformio.org/#!/platforms/titiva>`_
diff --git a/docs/index.rst b/docs/index.rst
index 8bb9fe21..2ff78019 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,8 +1,9 @@
 PlatformIO: A cross-platform code builder and the missing library manager
 =========================================================================
 
-*Atmel AVR & SAM, Espressif, Freescale Kinetis, Nordic nRF51, NXP LPC, ST STM32,
-TI MSP430 & Tiva, Teensy, Arduino, mbed, libOpenCM3, etc.*
+*Atmel AVR & SAM, Espressif, Freescale Kinetis, Nordic nRF51, NXP LPC,
+Silicon Labs EFM32, ST STM32, TI MSP430 & Tiva, Teensy, Arduino, mbed,
+libOpenCM3, etc.*
 
 .. image:: _static/platformio-logo.png
     :target: http://platformio.org
diff --git a/platformio/__init__.py b/platformio/__init__.py
index d0e072eb..f28df34d 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -1,14 +1,14 @@
 # Copyright (C) Ivan Kravets <me@ikravets.com>
 # See LICENSE for details.
 
-VERSION = (2, 1, "0.a1")
+VERSION = (2, 1, 0)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
 __description__ = ("A cross-platform code builder and the missing library "
                    "manager (Atmel AVR & SAM, Espressif, Freescale Kinetis, "
-                   "Nordic nRF51, NXP LPC, ST STM32, TI MSP430 & Tiva, "
-                   "Teensy, Arduino, mbed, libOpenCM3, etc.)")
+                   "Nordic nRF51, NXP LPC, Silicon Labs EFM32, ST STM32, "
+                   "TI MSP430 & Tiva, Teensy, Arduino, mbed, libOpenCM3, etc)")
 __url__ = "http://platformio.org"
 
 __author__ = "Ivan Kravets"
diff --git a/setup.py b/setup.py
index 41b5a586..6ae6c1c2 100644
--- a/setup.py
+++ b/setup.py
@@ -51,6 +51,6 @@ setup(
         "Topic :: Software Development :: Compilers"
     ],
     keywords=("builder library manager atmel avr sam espressif esp freescale "
-              "kinetis nordic nrf51 nxp lpc st stm32 ti msp430 tiva teensy "
-              "arduino mbed libopencm3")
+              "kinetis nordic nrf51 nxp lpc silicon labs efm32 st stm32 ti "
+              "msp430 tiva teensy arduino mbed libopencm3")
 )

From f038c7a28e3a0b073190a0be266a69ef023abb7a Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Wed, 3 Jun 2015 19:54:39 +0300
Subject: [PATCH 2/2] Version bump to 2.1.0 (issues #215, #219, #221, #225,
 #226)

---
 HISTORY.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index c6011099..65235d65 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,7 +1,7 @@
 Release History
 ===============
 
-2.1.0 (2015-??-??)
+2.1.0 (2015-06-03)
 ------------------
 
 * Added Silicon Labs EFM32 `siliconlabsefm32 <http://docs.platformio.org/en/latest/platforms/siliconlabsefm32.html>`_