diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-27 13:11:33 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-02-27 13:11:33 +0100 |
commit | 5e68c1283c297fb428a9347517ea02576bd55546 (patch) | |
tree | f7395115b90efd6c0239d6d72c5bca49168f6380 /nxproxy/VERSION | |
parent | 0a5d26d121a8420feb25bd68c8f1623edf50e0a8 (diff) | |
parent | 3e8d98f3337a21cd9147c1ac4f27258c95bf41b0 (diff) | |
download | nx-libs-5e68c1283c297fb428a9347517ea02576bd55546.tar.gz nx-libs-5e68c1283c297fb428a9347517ea02576bd55546.tar.bz2 nx-libs-5e68c1283c297fb428a9347517ea02576bd55546.zip |
Merge branch 'sunweaver-pr/support-builtin-fonts' into 3.6.x
Attributes GH PR #316: https://github.com/ArcticaProject/nx-libs/pull/316
Reviewed by Mihai Moldovan <ionic@ionic.de> -- Fri, 17 Feb 2017 22:00:58 -0800
Ulrich Sibiller <uli42@gmx.de> -- Mon, 27 Feb 2017 03:11:55 -0800
Diffstat (limited to 'nxproxy/VERSION')
0 files changed, 0 insertions, 0 deletions