0
0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-09-20 04:12:15 +02:00
keepassxc/cmake
Jonathan White 9e2be34897
Merge branch 'develop'
Conflicts:
	CMakeLists.txt
	cmake/CLangFormat.cmake
	snapcraft.yaml
	src/CMakeLists.txt
	src/core/Database.cpp
	src/core/Database.h
	src/core/Tools.cpp
	src/crypto/CryptoHash.h
	src/crypto/ssh/ASN1Key.h
	src/crypto/ssh/OpenSSHKey.cpp
	src/format/Kdbx4Reader.cpp
	src/gui/DatabaseTabWidget.cpp
	src/gui/DatabaseTabWidget.h
	src/gui/DatabaseWidget.cpp
	src/gui/DatabaseWidget.h
	src/gui/DetailsWidget.cpp
	src/gui/DetailsWidget.ui
	src/gui/EditWidgetProperties.cpp
	src/gui/EntryPreviewWidget.cpp
	src/gui/EntryPreviewWidget.ui
	src/gui/FileDialog.cpp
	src/gui/dbsettings/DatabaseSettingsDialog.cpp
	src/gui/dbsettings/DatabaseSettingsDialog.h
	src/gui/group/EditGroupWidget.cpp
	src/gui/group/EditGroupWidget.h
	src/sshagent/ASN1Key.h
	src/sshagent/OpenSSHKey.cpp
	src/sshagent/SSHAgent.cpp
	tests/CMakeLists.txt
2018-12-18 22:28:56 -05:00
..
CLangFormat.cmake Merge branch 'develop' 2018-12-18 22:28:56 -05:00
CodeCoverage.cmake Update and fix test coverage report generation 2018-10-19 21:45:53 +02:00
FindArgon2.cmake Reformat CMakeLists.txt files 2018-10-19 22:16:44 +02:00
FindGcrypt.cmake Reformat CMakeLists.txt files 2018-10-19 22:16:44 +02:00
FindLibGPGError.cmake Install needed PPA packages for deployment 2018-01-13 14:25:01 -05:00
FindQREncode.cmake Add QR code generator for TOTP export (#1167) 2018-10-19 14:42:49 -04:00
FindQuaZip.cmake Add sharing of groups between databases 2018-10-01 10:39:37 -04:00
Findsodium.cmake keepassxc-browser 2018-01-04 21:42:20 +01:00
FindYubiKey.cmake Ensure yubikey libs are dynamic; bump to c99 2018-02-01 21:40:47 +01:00
GenerateProductVersion.cmake Set windows EXE resource properties, resolves #329 2017-02-20 00:33:11 +01:00
GetGitRevisionDescription.cmake Display git revision in about dialog. 2015-07-18 13:14:13 +02:00
GetGitRevisionDescription.cmake.in Display git revision in about dialog. 2015-07-18 13:14:13 +02:00
GNUInstallDirs.cmake Use standard GNU install dirs and make them overridable. 2013-04-29 22:17:31 +02:00
VersionInfo.in Set windows EXE resource properties, resolves #329 2017-02-20 00:33:11 +01:00
VersionResource.rc Set windows EXE resource properties, resolves #329 2017-02-20 00:33:11 +01:00