diff options
| author | Jim Grandy <jgrandy@authentic8.com> | 2013-07-05 14:27:40 -0700 |
|---|---|---|
| committer | Jim Grandy <jgrandy@authentic8.com> | 2013-08-22 12:52:31 -0700 |
| commit | bd8083d7e2be0421d99ba2ba24d7fb7221988a30 (patch) | |
| tree | 0edef02c8a80352de229ce27372f02ac8b81dcc9 /xorg | |
| parent | 45b0bc9f17f0788bdfe28c0ae687faa0bce9374f (diff) | |
| download | xrdp-proprietary-bd8083d7e2be0421d99ba2ba24d7fb7221988a30.tar.gz xrdp-proprietary-bd8083d7e2be0421d99ba2ba24d7fb7221988a30.zip | |
Fix merge errors introduced in 3ae1b415 and 20ec9ee3
Diffstat (limited to 'xorg')
0 files changed, 0 insertions, 0 deletions