diff options
author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-09-20 12:55:16 +0200 |
---|---|---|
committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-09-20 12:55:16 +0200 |
commit | eb447c7ff965abe92bf49dbf404447b1808322c0 (patch) | |
tree | 9309e6614f23cc5cda6042e685b24eaa0a6b5522 /data | |
parent | 7a04ee7dd3fad10e30581d22956234aeff2b2f3a (diff) | |
parent | a57ed65f90c2ffda245c93aaa4aa710b605550d7 (diff) | |
download | libnitrokey-eb447c7ff965abe92bf49dbf404447b1808322c0.tar.gz libnitrokey-eb447c7ff965abe92bf49dbf404447b1808322c0.tar.bz2 |
Merge branch 'windows_MSVC2017' into OSX_merge_cleaned
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions