diff options
| author | norrarvid <norrarvid@gmail.com> | 2012-06-18 09:45:42 +0200 |
|---|---|---|
| committer | norrarvid <norrarvid@gmail.com> | 2012-06-18 09:45:42 +0200 |
| commit | e87ec5072169e201c41bfb1ad70f78b549fc2767 (patch) | |
| tree | 3f0accf2afe52678bfdd107db600fd1a86f9511b /sesman/libscp/libscp_session.c | |
| parent | d2903cd1fc2f02fd08ea0b55117a3a03e7131504 (diff) | |
| parent | fc49bf6b48878e9514fee3e3c8eb13789aefc71f (diff) | |
| download | xrdp-proprietary-e87ec5072169e201c41bfb1ad70f78b549fc2767.tar.gz xrdp-proprietary-e87ec5072169e201c41bfb1ad70f78b549fc2767.zip | |
fix minor merge conflict
Diffstat (limited to 'sesman/libscp/libscp_session.c')
0 files changed, 0 insertions, 0 deletions