Janek Bevendorff 26ff528a85 Merge branch 'meta/release-preparation' into release/2.1.1		2017-02-06 23:27:05 +01:00
..
CMakeLists.txt	Fix Windows linker and runtime errors when building against static Qt	2017-01-26 01:15:12 +01:00
entropy-meter.cpp	Fix entropy_meter script	2017-01-27 20:39:32 +01:00
kdbx-extract.cpp	Use QCommandLineParser	2017-01-14 14:08:10 -05:00
kdbx-merge.cpp	Extract readKeyFromLine.	2017-01-14 13:25:30 -05:00
keepassx-kwallet	search directory configured via environment	2016-10-25 10:18:23 -06:00