aboutsummaryrefslogtreecommitdiff
path: root/nxcomp
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-07 12:38:44 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-07 12:38:44 +0200
commitf2dc8121d903ddefba96483874dca69aac47fb59 (patch)
tree995c21b3fe7334999b99efa9b52c1c0b7ebce8d6 /nxcomp
parent82fc54e577c56ee3952f14c4a5c9f50c16645591 (diff)
parentfde52a9b773f85c59a3f6473f2fef08fde91016a (diff)
downloadnx-libs-f2dc8121d903ddefba96483874dca69aac47fb59.tar.gz
nx-libs-f2dc8121d903ddefba96483874dca69aac47fb59.tar.bz2
nx-libs-f2dc8121d903ddefba96483874dca69aac47fb59.zip
Merge branch 'uli42-pr/refactor_timeout' into 3.6.x
Attributes GH PR #899: https://github.com/ArcticaProject/nx-libs/pull/899
Diffstat (limited to 'nxcomp')
0 files changed, 0 insertions, 0 deletions