Jonathan White d06819eb6c Merge pull request #1881 from louib/disable_merge_when_locked ... Disable merge button when db is locked.		2018-07-08 19:52:58 -04:00
..
autotype	Add advanced password generator features (#1841)	2018-06-10 22:37:09 -04:00
browser	Add advanced password generator features (#1841)	2018-06-10 22:37:09 -04:00
cli	Add advanced password generator features (#1841)	2018-06-10 22:37:09 -04:00
core	Merge remote-tracking branch 'upstream/develop' into develop	2018-06-27 23:40:20 +03:00
crypto	Formatting the code.	2018-03-31 16:01:30 -04:00
format	Formatting the code.	2018-03-31 16:01:30 -04:00
gui	Merge pull request #1881 from louib/disable_merge_when_locked	2018-07-08 19:52:58 -04:00
keys	Formatting the code.	2018-03-31 16:01:30 -04:00
proxy	Merge branch 'master' into develop	2018-05-07 23:24:30 -04:00
sshagent	Merge branch 'master' into develop	2018-05-07 23:24:30 -04:00
streams	Formatting the code.	2018-03-31 16:01:30 -04:00
totp	Formatting the code.	2018-03-31 16:01:30 -04:00
zxcvbn	Correct zxcvbn build on windows & snap build	2018-02-21 21:59:42 -05:00
CMakeLists.txt	Add AppVeyor support (#1380)	2018-06-10 18:16:30 -04:00
config-keepassx.h.cmake	Remove KeePassHttp plugin and qhttp (#1752)	2018-03-31 11:36:18 -04:00
main.cpp	Allows printing version with -v when an instance is already running	2018-07-08 19:51:11 -04:00
version.h.cmake	Display git revision in about dialog.	2015-07-18 13:14:13 +02:00