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

Browse Source

Conflicts:
	libfreerdp/core/transport.c

...

This commit is contained in:

chris 2014-03-22 01:36:30 +01:00

parent 02e49a4b40 6a0ba8393d

commit 4c9040c289

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available