Merge pull request #16 from AlessandroLazzari/master

Release version 1.4.17
moneymanagerex · Jan 7, 2015 · 61bd063 · 61bd063
2 parents 07a05e0 + b47bb91
commit 61bd063
Show file tree

Hide file tree

Showing 8 changed files with 897 additions and 888 deletions.
diff --git a/build.gradle b/build.gradle
@@ -50,8 +50,8 @@ android {
         applicationId 'com.money.manager.ex'
         minSdkVersion 8
         targetSdkVersion 19
-        versionCode 600
-        versionName '1.4.16'
+        versionCode 601
+        versionName '1.4.17'
     }
     sourceSets {
         main {

diff --git a/libs/BCPROV-LICENSE.txt b/libs/BCPROV-LICENSE.txt
@@ -0,0 +1,9 @@
+LICENSE
+Copyright (c) 2000 - 2013 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/libs/bcprov-jdk16-146.jar b/libs/bcprov-jdk16-146.jar
diff --git a/libs/dropbox-android-sdk-1.5.3.jar b/libs/dropbox-android-sdk-1.5.3.jar
diff --git a/libs/dropbox-android-sdk-1.6.2.jar b/libs/dropbox-android-sdk-1.6.2.jar
diff --git a/res/raw/changelog.xml b/res/raw/changelog.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2012-2014 Alessandro Lazzari
   ~
   ~ This program is free software; you can redistribute it and/or
@@ -18,8 +17,12 @@
   -->
 
 <changelog bulletedList="true">
+    <changelogversion changeDate="January 7, 2015" versionName="1.4.17">
+        <changelogtext>Dropbox API updated to version 1.6.2</changelogtext>
+        <changelogtext>Fixed other minor bugs</changelogtext>
+    </changelogversion>
     <changelogversion changeDate="December 28, 2014" versionName="1.4.16">
-    <changelogtext>Add translation: German (thanks paulle and philipp9494)</changelogtext>
+        <changelogtext>Add translation: German (thanks paulle and philipp9494)</changelogtext>
         <changelogtext>Add translation: Japanese (thanks naofum)</changelogtext>
         <changelogtext>Update all translations</changelogtext>
     </changelogversion>