diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-03-01 21:46:32 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-03-01 21:46:32 +0100 |
commit | ae40bb9c4e579ad947dc4a18d042e725b912c128 (patch) | |
tree | 805cb63732464b54c2ae3318b5f07c7b78150c03 /nxcompshad/include | |
parent | a5a0a5c29bf7c1d1e346b5813e6696a5f0522136 (diff) | |
parent | 66ef3e46f4f38e5755ae32ab49d065a2707e90e7 (diff) | |
download | nx-libs-ae40bb9c4e579ad947dc4a18d042e725b912c128.tar.gz nx-libs-ae40bb9c4e579ad947dc4a18d042e725b912c128.tar.bz2 nx-libs-ae40bb9c4e579ad947dc4a18d042e725b912c128.zip |
Merge branch 'mjtrangoni-WIP-travis' into 3.6.x
Attributes GH PR #624: https://github.com/ArcticaProject/nx-libs/pull/624
Diffstat (limited to 'nxcompshad/include')
0 files changed, 0 insertions, 0 deletions