diff options
| author | Jim Grandy <jgrandy@authentic8.com> | 2013-08-22 12:59:51 -0700 |
|---|---|---|
| committer | Jim Grandy <jgrandy@authentic8.com> | 2013-08-22 12:59:51 -0700 |
| commit | 7566fbfefffba237e23cb32935fc59ff6103b5ff (patch) | |
| tree | 2ddba0f0795ab34263cfbe69852c0274fe2e6b97 | |
| parent | ac8d4bfb41eaf4321a79ad509365aa1e61e2c18f (diff) | |
| parent | f4b8798a1d4f527092980159b9de8b0c3d74c255 (diff) | |
| download | xrdp-proprietary-7566fbfefffba237e23cb32935fc59ff6103b5ff.tar.gz xrdp-proprietary-7566fbfefffba237e23cb32935fc59ff6103b5ff.zip | |
Merge branch 'merge-a8' of a8git:xrdp into merge-a8
Conflicts:
xorg/X11R7.6/rdp/rdp.h
xorg/X11R7.6/rdp/rdpdraw.c
0 files changed, 0 insertions, 0 deletions