Jonathan White 14e3d9d576 Merge remote-tracking branch 'origin/master' into develop ... # Conflicts: # src/core/Group.cpp		2017-10-01 11:10:10 -04:00
..
drivers	Corrected multiple Yubikey bugs (#880)	2017-09-23 11:45:20 -04:00
ChallengeResponseKey.h	Update and fix copyright headers	2017-06-14 15:54:43 +02:00
CompositeKey_p.h	Drop Qt module name from include statements.	2013-10-03 15:18:16 +02:00
CompositeKey.cpp	Feature : --key-file option for CLI (#816)	2017-07-25 13:41:52 -04:00
CompositeKey.h	Feature : --key-file option for CLI (#816)	2017-07-25 13:41:52 -04:00
FileKey.cpp	spelling: correct	2017-01-14 17:31:38 +01:00
FileKey.h	Make C++11 mandatory.	2015-09-12 13:55:50 +02:00
Key.h	Drop Qt module name from include statements.	2013-10-03 15:18:16 +02:00
PasswordKey.cpp	Add unit test TestKeePass2Reader.	2010-09-20 00:16:30 +02:00
PasswordKey.h	Drop Qt module name from include statements.	2013-10-03 15:18:16 +02:00
YkChallengeResponseKey.cpp	Corrected multiple Yubikey bugs (#880)	2017-09-23 11:45:20 -04:00
YkChallengeResponseKey.h	Update and fix copyright headers	2017-06-14 15:54:43 +02:00