Armin Novak 83a64e99ea Merge branch 'android_async' of github.com:akallabeth/FreeRDP into android_async ...

Conflicts:
	client/Android/FreeRDPCore/.classpath
	client/Android/FreeRDPCore/jni/android_freerdp.c

2013-10-01 16:22:27 +02:00

..

Android

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

2013-10-01 16:22:27 +02:00

common

Merge pull request #1509 from akallabeth/smartcard_fixes

2013-09-25 08:37:26 -07:00

DirectFB

…

iOS

…

Mac

Correct handling of mouse scrolling for osx

2013-09-22 00:07:27 +02:00

Sample

freerdp: merge with master

2013-09-16 17:10:27 -04:00

Windows

wfreerdp: fix compilation

2013-09-19 12:08:20 -04:00

X11

freerdp: merge with master

2013-09-16 17:10:27 -04:00

.gitignore

…

CMakeLists.txt

…