Nitrokey App

~nitrokey/nitrokey/+git/libnitrokey:names_clash

  1. Git
  2. lp:~nitrokey/nitrokey/+git/libnitrokey
  3. names_clash
Last commit made on 2018-08-23
Get this branch:
git clone -b names_clash https://git.launchpad.net/~nitrokey/nitrokey/+git/libnitrokey

Branch merges

Branch information

Name:
names_clash
Repository:
lp:~nitrokey/nitrokey/+git/libnitrokey

Recent commits

dee6ebe... by Szczepan

Fix potential names clash with client projects

Nitrokey App was failing to build due to name clash with version.h file. Renamed.

Tested CMake, QMake and Meson build.

Signed-off-by: Szczepan Zalega <email address hidden>

ef171df... by Szczepan

Merge branch 'pr_131'

Add virtual destructor to logger classes.
Fixes compilation warning

Fixes #131
Fixes #129

2ebf30d... by Szczepan

Merge branch 'pr_132'

Update Catch to 2.3.0
Both CMake and Meson build files updated.
Tests compile (with both) and run with a Storage device.
Fixes #132

8de3f4d... by Tom Hughes

Update for compatibility with Catch2 version 2.3.0

5e8073e... by Tom Hughes

Update Catch to version 2.3.0

0f1a273... by Tom Hughes

Update URL for Catch submodule

6984151... by Szczepan

Merge branch 'pr_130'

Meson: copy udev, fallback for git version.
Fixes #130

f4ac8a6... by Igor Gnatenko

log: define default virtual destructor for LogHandler

Fixes: https://github.com/Nitrokey/libnitrokey/issues/129
Signed-off-by: Igor Gnatenko <email address hidden>

ec67692... by Igor Gnatenko

meson: install udev rules

Signed-off-by: Igor Gnatenko <email address hidden>

0f934ad... by Igor Gnatenko

meson: improve generation of vcs_tag

Signed-off-by: Igor Gnatenko <email address hidden>