Armin Novak d7ee71cc8b Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async ... Conflicts: client/Android/FreeRDPCore/.classpath client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkDB.java		2013-10-04 10:04:03 +02:00
..
jni	Added missing assert.	2013-10-01 16:23:17 +02:00
res	Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async	2013-10-04 10:04:03 +02:00
src/com/freerdp/freerdpcore	Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async	2013-10-04 10:04:03 +02:00
.classpath	android: fixed classpaths	2013-10-03 13:28:31 +02:00
.project	Reorganizing into library project	2013-02-15 02:22:28 -08:00
AndroidManifest.xml.cmake	Fixed android shutdown crash.	2013-09-27 11:41:25 +02:00
ant.properties.cmake	Fixed out of source build.	2013-09-17 16:09:04 +02:00
build.xml.cmake	Fixed out of source build.	2013-09-17 16:09:04 +02:00
CMakeLists.txt	Added CMake generated BuildConfiguration java class.	2013-10-02 10:24:44 +02:00
local.properties.cmake	android: adapted build for library project	2013-02-18 15:00:55 +01:00
project.properties.cmake	Fixed out of source build.	2013-09-17 16:07:52 +02:00