Merge branch 'recurring'

This commit is contained in:
Aditya Kulkarni
2019-02-01 10:23:58 -08:00
12 changed files with 617 additions and 64 deletions

View File

@@ -51,7 +51,8 @@ SOURCES += \
src/fillediconlabel.cpp \
src/addressbook.cpp \
src/logger.cpp \
src/addresscombo.cpp
src/addresscombo.cpp \
src/recurring.cpp
HEADERS += \
src/mainwindow.h \
@@ -71,7 +72,8 @@ HEADERS += \
src/fillediconlabel.h \
src/addressbook.h \
src/logger.h \
src/addresscombo.h
src/addresscombo.h \
src/recurring.h
FORMS += \
src/mainwindow.ui \
@@ -85,7 +87,9 @@ FORMS += \
src/connection.ui \
src/zboard.ui \
src/addressbook.ui \
src/createzcashconfdialog.ui
src/createzcashconfdialog.ui \
src/recurringdialog.ui \
src/newrecurring.ui
TRANSLATIONS = res/zec_qt_wallet_es.ts \