diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2013-10-09 14:15:50 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2013-10-09 14:15:50 -0700 |
| commit | 086481395c966850f8175921202f246805d73ded (patch) | |
| tree | b3a413c613d3ec0359b988912d626fd1dafc5be3 /vrplayer/decoderthread.cpp | |
| parent | 25369460a1b2f204d03a6bc4821251d7ef2d7adf (diff) | |
| parent | a4d2917a0a169c0672dc61be4f7b4689a02278b3 (diff) | |
| download | xrdp-proprietary-086481395c966850f8175921202f246805d73ded.tar.gz xrdp-proprietary-086481395c966850f8175921202f246805d73ded.zip | |
Merge branch 'multimon' of git://github.com/speidy/xrdp into speidy-multimon
Conflicts:
common/xrdp_client_info.h
libxrdp/xrdp_iso.c
libxrdp/xrdp_sec.c
Diffstat (limited to 'vrplayer/decoderthread.cpp')
0 files changed, 0 insertions, 0 deletions