Set lock when adding new displays to the chain
Merge branch 'master' of github.com:neutrinolabs/xrdp
simplesound: fixed CHANSRV_PORT_STR undefined error
update version
Merge branch 'master' of github.com:neutrinolabs/xrdp
minor fixes
Merge pull request #102 from bartw72/lock-on-add

Set lock when adding new displays to the chain
Numlock out of sync fix
Merge branch 'master' of github.com:neutrinolabs/xrdp
Merge pull request #127 from ArvidNorr/numlock

Numlock out of sync fix
neutrinordp: minor changes, coding style, log level
Update faq-compile.txt
Merge pull request #140 from ajaissle/patch-1

Update faq-compile.txt
Add details for crypt_level=fips to man page
Merge pull request #161 from anthonyagresta/patch-1

man page, add details for crypt_level=fips
Merge remote-tracking branch 'upstream/master'