Janek Bevendorff 26ff528a85 Merge branch 'meta/release-preparation' into release/2.1.1

2017-02-06 23:27:05 +01:00

..

CMakeLists.txt

…

entropy-meter.cpp

…

kdbx-extract.cpp

…

kdbx-merge.cpp

…

keepassx-kwallet

…