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

..

aFreeRDP

Fixed android shutdown crash.

2013-09-27 11:41:25 +02:00

FreeRDPCore

Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async

2013-10-04 10:04:03 +02:00

.gitignore

aFreeRDP: initial release

2013-01-29 12:59:58 +01:00

CMakeLists.txt

Added debugging settings to allow android debugging.

2013-09-23 17:48:02 +02:00

ModuleOptions.cmake

freerdp: remove vendor-specific options from build system, add automatic ways of including external clients/servers

2013-09-03 20:37:04 -04:00