IvanF 235baa3dcc Merge branch 'master' of https://github.com/keepassx/keepassx
Conflicts:
	README.md
	src/core/Config.cpp
	src/gui/DatabaseTabWidget.cpp
	src/gui/DatabaseTabWidget.h
	src/gui/DatabaseWidget.cpp
	src/gui/DatabaseWidget.h
	src/gui/MainWindow.cpp
	src/gui/MainWindow.h
	src/gui/MainWindow.ui
	src/gui/SearchWidget.ui
	src/gui/SettingsWidget.cpp
	src/gui/SettingsWidgetGeneral.ui
2015-01-29 00:17:39 -08:00
..
2012-07-18 21:22:26 +02:00
2014-03-22 14:49:32 +00:00
2013-11-17 10:15:50 +01:00
2014-03-22 14:49:32 +00:00
2014-03-22 14:49:32 +00:00
2014-05-17 18:13:22 +02:00
2013-10-13 18:08:50 +02:00
2014-01-12 17:13:03 +01:00
2014-05-16 19:49:58 +02:00
2012-10-21 15:09:01 +02:00
2012-05-27 20:15:06 +02:00
2012-05-27 20:15:06 +02:00