Merge branch 'release/2.1.0' into develop

brianhornsby · May 18, 2014 · fa88b76 · fa88b76
2 parents 0e132c6 + a733e92
commit fa88b76
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.openvpn" name="OpenVPN" version="2.0.1" provider-name="brianhornsby">
+<addon id="script.openvpn" name="OpenVPN" version="2.1.0" provider-name="brianhornsby">
 	<requires>
 		<import addon="xbmc.python" version="2.1.0"/>
 		<import addon="script.module.beautifulsoup" version="3.0.8"/>

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+*** 2.1.0 ***
+Updated xbmc.python version. Fixed issue with reading running OpenVPN configuration on OpenELEC. [0e132c6]
+Changed country flag images to https://github.com/koppi/iso-country-flags-svg-collection. [3dc6b7e]
+
 *** 2.0.1 ***
 Fixes for issues #8 and #9.