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
..
2015-12-06 21:06:06 +01:00
2016-01-31 19:03:25 +01:00
2015-12-06 21:06:06 +01:00
2015-09-06 23:41:29 +02:00
2016-01-31 19:03:25 +01:00
2016-01-31 19:03:25 +01:00
2016-01-31 19:03:25 +01:00
2015-09-06 23:41:29 +02:00
2015-12-06 21:06:06 +01:00
2015-12-06 21:06:06 +01:00
2015-12-06 21:06:06 +01:00
2015-12-06 21:06:06 +01:00
2015-12-06 21:06:06 +01:00
2015-09-06 23:41:29 +02:00
2015-12-06 21:06:06 +01:00
2015-12-06 21:06:06 +01:00
2016-01-31 19:03:25 +01:00
2016-01-31 19:03:25 +01:00
2015-09-06 23:41:29 +02:00
2015-12-06 21:06:06 +01:00
2015-05-15 00:20:23 +02:00