Merge 1.1.0 changes back to master.
authorJames Muehlner <james.muehlner@guac-dev.org>
Wed, 10 Apr 2019 04:52:28 +0000 (21:52 -0700)
committerJames Muehlner <james.muehlner@guac-dev.org>
Wed, 10 Apr 2019 04:52:28 +0000 (21:52 -0700)
commit6dad6cd91933a19bc18095854e93354b6764d763
tree8bcb9c6ccdbd22556579b60aea3ed532f2649865
parentdc71987fcaa3e5f37e97ae7224fffa3b933f15f5
parentdd4c3968d17bd166a9e294c1437c1e554518e5b3
Merge 1.1.0 changes back to master.
src/protocols/rdp/rdp_fs.c
src/protocols/rdp/rdp_fs.h
src/protocols/rdp/rdp_settings.c