Merge branch 'develop' into feature/window-modified-indicator

2017-03-21 00:11:19 -03:00
parent 18b5b76a80 7608405a1f
commit d50fe46f0e
48 changed files with 2903 additions and 130 deletions
--- a/src/gui/DatabaseTabWidget.h
+++ b/src/gui/DatabaseTabWidget.h
@@ -66,6 +66,7 @@ public:
 public slots:
    void newDatabase();
    void openDatabase();
+    void importCsv();
    void mergeDatabase();
    void importKeePass1Database();
    bool saveDatabase(int index = -1);