Merge branch 'develop'

Browse Source

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

...

This commit is contained in:

Jonathan White

2018-12-18 22:28:56 -05:00

parent 66a36b3af1 a070f1bce7

commit 9e2be34897

421 changed files with 18208 additions and 12907 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

share/icons/application/16x16/actions/favicon-download.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 755 B

BIN

share/icons/application/16x16/actions/system-help.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 897 B

BIN

share/icons/application/22x22/actions/favicon-download.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB

BIN

share/icons/application/22x22/actions/system-help.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

share/icons/application/32x32/actions/favicon-download.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

share/icons/application/32x32/actions/system-help.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB