Jonathan White aba4fa94be Merge remote-tracking branch 'keepassx/master'
# Conflicts:
#	README.md
#	share/translations/keepassx_de.ts
#	src/CMakeLists.txt
#	src/gui/MainWindow.h
2016-02-27 19:11:09 -05:00
..
2016-01-29 17:22:37 +01:00
2016-01-29 17:22:37 +01:00
2015-09-12 13:55:50 +02:00
2015-10-15 18:02:31 +02:00
2015-10-11 10:44:30 +02:00
2015-09-12 13:55:50 +02:00
2015-09-21 23:23:51 +02:00
2015-09-21 23:23:51 +02:00
2016-02-08 18:13:29 +01:00
2015-09-12 13:55:50 +02:00
2015-09-12 13:55:50 +02:00
2015-12-15 21:05:00 +01:00
2015-10-15 18:02:31 +02:00
2015-10-15 18:02:31 +02:00
2015-09-12 13:55:50 +02:00
2015-09-12 13:55:50 +02:00
2013-11-17 10:15:50 +01:00
2016-01-29 17:22:37 +01:00
2015-09-12 13:55:50 +02:00
2015-09-12 13:55:50 +02:00
2015-09-26 11:44:27 +02:00
2015-09-12 13:55:50 +02:00
2016-01-29 17:22:37 +01:00
2014-05-17 18:13:22 +02:00
2015-09-12 13:55:50 +02:00
2015-09-12 13:55:50 +02:00
2013-10-13 18:08:50 +02:00
2015-09-12 13:55:50 +02:00
2015-10-15 18:02:31 +02:00
2015-09-12 13:55:50 +02:00
2015-09-12 13:55:50 +02:00
2015-09-12 13:55:50 +02:00
2014-05-16 19:49:58 +02:00
2015-10-11 10:44:30 +02:00
2015-09-12 13:55:50 +02:00
2012-05-27 20:15:06 +02:00
2015-09-12 13:55:50 +02:00
2012-05-27 20:15:06 +02:00