Merge branch 'merge-a8' of a8git:xrdp into merge-a8

Browse Source

Conflicts:
	xorg/X11R7.6/rdp/rdp.h
	xorg/X11R7.6/rdp/rdpdraw.c

...

This commit is contained in:

Jim Grandy 2013-08-22 12:59:51 -07:00

parent ac8d4bfb41 f4b8798a1d

commit 7566fbfeff

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