diff options
author | Szczepan Zalega <szczepan@nitrokey.com> | 2019-06-13 15:01:23 +0200 |
---|---|---|
committer | Szczepan Zalega <szczepan@nitrokey.com> | 2019-06-13 15:01:23 +0200 |
commit | 3eb4856ed8c9a5a8179679f2432c01d382a9c07a (patch) | |
tree | a06f2f7dad5fe320677828b9f95d4482f0c4f7d9 /.idea | |
parent | 4a0da78d76906f052642e19dedf72f18298e5f9c (diff) | |
parent | 82e659779531a969155420f4f816b2458de3cfd5 (diff) | |
download | libnitrokey-3eb4856ed8c9a5a8179679f2432c01d382a9c07a.tar.gz libnitrokey-3eb4856ed8c9a5a8179679f2432c01d382a9c07a.tar.bz2 |
Merge branch 'bootloader_pro'
Add bootloader support for the Nitrokey Pro v0.11+
Diffstat (limited to '.idea')
-rw-r--r-- | .idea/vcs.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..efdb874 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,7 @@ <project version="4"> <component name="VcsDirectoryMappings"> <mapping directory="$PROJECT_DIR$" vcs="Git" /> + <mapping directory="$PROJECT_DIR$/hidapi" vcs="Git" /> + <mapping directory="$PROJECT_DIR$/unittest/Catch" vcs="Git" /> </component> </project>
\ No newline at end of file |