diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-20 10:47:10 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-11-20 10:47:10 +0100 |
commit | 3b640a0f8de615e53dd6801ebd2aa0cf04f76c69 (patch) | |
tree | 925afe265c0f0a5a36b215e5bf68e6fe1c2e3bdf /nxcompshad/src/Core.cpp | |
parent | 39d45a0e8ff58a649e5c8e403f89e3b14ad1c9d2 (diff) | |
parent | 4ef4fbf16eca01b40176a830bfa6a8ada95e357b (diff) | |
download | nx-libs-3b640a0f8de615e53dd6801ebd2aa0cf04f76c69.tar.gz nx-libs-3b640a0f8de615e53dd6801ebd2aa0cf04f76c69.tar.bz2 nx-libs-3b640a0f8de615e53dd6801ebd2aa0cf04f76c69.zip |
Merge branch 'uli42-pr/options_on_reconnect' into 3.6.x
Attributes GH PR #554: https://github.com/ArcticaProject/nx-libs/pull/554
Diffstat (limited to 'nxcompshad/src/Core.cpp')
0 files changed, 0 insertions, 0 deletions