diff options
| author | speidy <speidy@gmail.com> | 2013-10-30 19:47:26 +0200 |
|---|---|---|
| committer | speidy <speidy@gmail.com> | 2013-10-30 19:47:26 +0200 |
| commit | 0d2a4ce195974fdddf9f757219eedf5927eb2892 (patch) | |
| tree | 07a2ec19968c4f9e88a880668313f65c388db275 /common/xrdp_client_info.h | |
| parent | 8cc619c2232df496fa08c128368754c062a666ce (diff) | |
| parent | 7a484c1a7926ba7230bae19d501de7ddd129395c (diff) | |
| download | xrdp-proprietary-0d2a4ce195974fdddf9f757219eedf5927eb2892.tar.gz xrdp-proprietary-0d2a4ce195974fdddf9f757219eedf5927eb2892.zip | |
common: fix conflict
Diffstat (limited to 'common/xrdp_client_info.h')
| -rw-r--r-- | common/xrdp_client_info.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/xrdp_client_info.h b/common/xrdp_client_info.h index 56aeb0bd..a257f907 100644 --- a/common/xrdp_client_info.h +++ b/common/xrdp_client_info.h @@ -100,8 +100,8 @@ struct xrdp_client_info char orders[32]; int order_flags_ex; int use_bulk_comp; - int use_fast_path; int pointer_flags; /* 0 color, 1 new, 2 no new */ + int use_fast_path; int require_credentials; /* when true, credentials *must* be passed on cmd line */ char client_addr[256]; char client_port[256]; |