summaryrefslogtreecommitdiffstats
path: root/xorg
diff options
context:
space:
mode:
authorJim Grandy <jgrandy@authentic8.com>2013-08-22 13:58:43 -0700
committerJim Grandy <jgrandy@authentic8.com>2013-08-22 13:58:43 -0700
commitb3ee3cbd4bd90cd65af67de118faac17c7ee57e5 (patch)
tree914159fad799d588d06a9c47d8589005edcccff2 /xorg
parent72ec05d37edd9745c3c797a455fc7dc023ef61ce (diff)
downloadxrdp-proprietary-b3ee3cbd4bd90cd65af67de118faac17c7ee57e5.tar.gz
xrdp-proprietary-b3ee3cbd4bd90cd65af67de118faac17c7ee57e5.zip
Another merge error in sesman/chansrv/clipboar.c
Diffstat (limited to 'xorg')
0 files changed, 0 insertions, 0 deletions