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
..
2015-01-29 00:17:39 -08:00
2014-04-26 18:34:26 +02:00
2014-03-23 17:25:39 +00:00
2012-07-18 21:22:26 +02:00
2013-10-03 15:18:16 +02:00
2012-05-25 13:42:55 +02:00
2013-10-03 15:18:16 +02:00
2013-10-03 15:18:16 +02:00
2014-01-13 00:24:29 +01:00
2014-01-12 17:13:10 +01:00
2014-01-12 17:13:10 +01:00
2014-05-26 18:41:48 +02:00
2014-05-26 18:41:48 +02:00
2015-01-29 00:17:39 -08:00
2014-03-22 14:49:32 +00:00
2014-01-12 17:13:10 +01:00
2012-07-27 18:54:35 +02:00
2013-10-03 15:18:16 +02:00
2013-11-17 10:15:50 +01:00
2015-01-29 00:17:39 -08:00
2014-05-17 11:16:27 +02:00
2015-01-29 00:17:39 -08:00
2015-01-29 00:17:39 -08:00
2014-05-17 18:17:31 +02:00
2014-05-17 18:17:31 +02:00
2014-01-02 10:51:51 +01:00
2013-10-03 15:18:16 +02:00
2013-10-03 15:18:16 +02:00
2013-10-03 15:18:16 +02:00
2012-10-29 23:44:10 +01:00
2013-10-03 15:18:16 +02:00
2013-11-17 10:15:50 +01:00
2015-01-29 00:17:39 -08:00
2014-03-22 14:49:32 +00:00
2014-03-22 14:49:32 +00:00
2012-10-29 22:41:37 +01:00
2013-10-03 15:18:16 +02:00
2013-11-17 10:15:50 +01:00
2012-07-25 12:18:16 +02:00
2013-10-03 15:18:16 +02:00
2012-06-29 15:22:43 +02:00
2013-10-03 15:18:16 +02:00
2014-05-17 18:13:22 +02:00
2012-07-06 18:50:52 +02:00
2013-10-03 15:18:16 +02:00
2013-10-03 15:18:16 +02:00
2014-11-19 11:46:38 +09:00
2014-11-02 11:44:03 +01:00
2014-11-19 11:46:38 +09:00
2013-10-13 18:08:50 +02:00
2013-10-08 22:09:20 +02:00
2014-11-02 11:44:03 +01:00
2014-01-13 21:40:23 +01:00
2014-11-02 11:44:03 +01:00
2014-01-12 17:13:03 +01:00
2014-01-13 21:40:23 +01:00
2014-01-13 21:40:23 +01:00
2014-05-17 18:17:31 +02:00
2014-05-16 19:49:58 +02:00
2014-11-30 23:04:17 +01:00
2015-01-29 00:17:39 -08:00
2014-11-30 23:04:17 +01:00
2014-04-14 22:57:18 +02:00
2012-07-22 22:02:06 +02:00
2013-10-03 15:18:16 +02:00
2013-10-08 22:09:20 +02:00
2012-10-21 15:09:01 +02:00
2012-05-27 20:15:06 +02:00
2013-10-03 15:18:16 +02:00
2012-05-27 20:15:06 +02:00