cgeo.git - cgeo without proprietary dependencies

	Commit message (Expand)	Author	Age	Files	Lines
*	merge upstream	Wolfgang Wiedmeyer	2015-10-11	1	-21/+30
\|\
\| *	Upgrade to RxJava 1.0.8	Samuel Tardieu	2015-03-07	1	-1/+1
\| *	upgrade jackson to 2.5.1	Bananeweizen	2015-03-03	1	-3/+3
\| *	upgrade to butterknife 6.1	Bananeweizen	2015-03-03	1	-2/+2
\| *	Upgrade to RxJava 1.0.7	Samuel Tardieu	2015-03-03	1	-1/+1
\| *	Upgrade to RxJava 1.0.6	Samuel Tardieu	2015-02-12	1	-1/+1
\| *	Do not require RxJavaAsyncUtils anymore	Samuel Tardieu	2015-02-05	1	-2/+0
\| *	Upgrade to RxJava 1.0.5	Samuel Tardieu	2015-02-05	1	-1/+1
\| *	Upgrade to RxAndroid 0.24.0	Samuel Tardieu	2015-01-07	1	-1/+1
\| *	fix #4585: split play services	Bananeweizen	2015-01-04	1	-1/+1
\| *	use current build tools version in gradle builds	Michael Keppler	2015-01-03	1	-1/+1
\| *	Upgrade to RxJava 1.0.4	Samuel Tardieu	2015-01-01	1	-1/+1
\| *	Upgrade to Rxjava 1.0.3	Samuel Tardieu	2014-12-19	1	-1/+1
\| *	Fix errors in commons lang3 definition	Samuel Tardieu	2014-12-09	1	-2/+2
\| *	Add commons libraries to automatic update	Samuel Tardieu	2014-12-09	1	-3/+6
\| *	Upgrade to RxJava 1.0.2 and Jackson 2.4.4	Samuel Tardieu	2014-12-09	1	-4/+4
\| *	Upgrade to RxJava 1.0.1	Samuel Tardieu	2014-12-01	1	-1/+1
\| *	Fix gradle build	Samuel Tardieu	2014-11-20	1	-4/+4
\| *	Upgrade to RxJava releases 1.x	Samuel Tardieu	2014-11-20	1	-4/+6
\| *	Upgrade to RxJava 0.20.7	Samuel Tardieu	2014-11-18	1	-1/+1
\| *	upgrade to AndroidAnnotations 3.2	Bananeweizen	2014-11-15	1	-2/+2
\| *	upgrade to butterknife 6.0.0	Bananeweizen	2014-11-02	1	-2/+2
\| *	Upgrade to RxJava 0.20.6	Samuel Tardieu	2014-10-20	1	-1/+1
\| *	Upgrade to Jackson 2.4.3	Samuel Tardieu	2014-10-10	1	-3/+3
\| *	Upgrade to RxJava 0.20.5	Samuel Tardieu	2014-10-10	1	-1/+1
\| *	Fix maven repository version of Android Annotations (3.1 instead of 3.1.0) fo...	Arne Schwabe	2014-09-30	1	-1/+1
\| *	upgrade android annotations to 3.1	Bananeweizen	2014-09-28	1	-1/+1
\| *	fix #4312: OOM in Jenkins findbugs	Bananeweizen	2014-09-07	1	-3/+3
\| *	use new instrumentation test runner	Bananeweizen	2014-09-07	1	-3/+1
\| *	Upgrade to RxJava 0.20.4	Samuel Tardieu	2014-09-06	1	-1/+1
\| *	upgrade to butterknife 5.1.2	Bananeweizen	2014-09-03	1	-2/+2
\| *	Upgrade to RxJava 0.20.2	Samuel Tardieu	2014-08-31	1	-1/+1
\| *	Upgrade to RxJava 0.20.1	Samuel Tardieu	2014-08-27	1	-1/+1
\| *	Merge branch 'release' into upstream	Samuel Tardieu	2014-08-26	1	-0/+1
\| \|\
\| * \|	Upgrade to RxJava 0.20.0	Samuel Tardieu	2014-08-19	1	-1/+1
\| * \|	fix #4151: proguard use for Gradle debug builds	Samuel Tardieu	2014-08-12	1	-1/+1
\| * \|	enable proguard in gradle build	Bananeweizen	2014-08-09	1	-2/+2
\| * \|	Update build tools for Gradle to version 20	Samuel Tardieu	2014-08-06	1	-1/+1
\| * \|	Update Google Play services	Samuel Tardieu	2014-08-06	1	-1/+1
\| * \|	Import Google Play Services	Samuel Tardieu	2014-07-30	1	-0/+1
\| * \|	Import Jackson libraries	Samuel Tardieu	2014-08-04	1	-1/+8
* \| \|	gradle changes not necessary, if libs compiled externally	wiewo	2014-10-27	1	-0/+1
* \| \|	little gradle corrections to enable lib builds	wiewo	2014-10-25	1	-1/+0
* \| \|	also change build.gradle	wiewo	2014-10-12	1	-3/+3
\| \|/ \|/\|
* \|	Add showcaseview to Gradle build	Samuel Tardieu	2014-08-26	1	-0/+1
\|/
*	Update gradle file in update-libs	Samuel Tardieu	2014-07-24	1	-1/+1
*	Also enable Java 1.7 in gradle build file	Arne Schwabe	2014-07-17	1	-0/+5
*	Update to gradle version 0.12.+	Arne Schwabe	2014-06-30	1	-1/+1
*	upgrade to butterknife 5.1.1	Bananeweizen	2014-06-29	1	-8/+8
*	Fix bulding with gradle/Android studio.	Arne Schwabe	2014-06-09	1	-2/+2