aboutsummaryrefslogtreecommitdiff
path: root/src/qt/Makefile.am
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-11-16 09:55:07 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2013-11-16 09:55:07 +0100
commit3443adecf100181c6e668f2e7a09bf2cfd794621 (patch)
tree787a1f65ce54baeebc4702c3b7c4baa1ddf732ba /src/qt/Makefile.am
parent0b4bd485ba33ab592b4aac759bcd3db6362a3b2f (diff)
parent6a86c24db146d9ca5d1d5c83099d935c3feb63bb (diff)
Merge pull request #3253
6a86c24 Coin Control Features (Cozz Lovan) 8dfd8c6 pass nBytes as parameter to GetMinFee(..) (Cozz Lovan)
Diffstat (limited to 'src/qt/Makefile.am')
-rw-r--r--src/qt/Makefile.am14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
index e05d3d79af..31c032ecbf 100644
--- a/src/qt/Makefile.am
+++ b/src/qt/Makefile.am
@@ -72,7 +72,10 @@ QT_TS = locale/bitcoin_ach.ts \
locale/bitcoin_zh_TW.ts
QT_FORMS_UI = forms/aboutdialog.ui forms/addressbookpage.ui \
- forms/askpassphrasedialog.ui forms/editaddressdialog.ui forms/intro.ui \
+ forms/askpassphrasedialog.ui \
+ forms/coincontroldialog.ui \
+ forms/editaddressdialog.ui \
+ forms/intro.ui \
forms/openuridialog.ui \
forms/optionsdialog.ui forms/overviewpage.ui forms/receiverequestdialog.ui \
forms/receivecoinsdialog.ui \
@@ -83,6 +86,8 @@ QT_MOC_CPP = moc_aboutdialog.cpp moc_addressbookpage.cpp \
moc_addresstablemodel.cpp moc_askpassphrasedialog.cpp \
moc_bitcoinaddressvalidator.cpp moc_bitcoinamountfield.cpp \
moc_bitcoingui.cpp moc_bitcoinunits.cpp moc_clientmodel.cpp \
+ moc_coincontroldialog.cpp \
+ moc_coincontroltreewidget.cpp \
moc_csvmodelwriter.cpp moc_editaddressdialog.cpp moc_guiutil.cpp \
moc_intro.cpp moc_macdockiconhandler.cpp moc_macnotificationhandler.cpp \
moc_monitoreddatamapper.cpp moc_notificator.cpp \
@@ -110,7 +115,7 @@ PROTOBUF_PROTO = paymentrequest.proto
BITCOIN_QT_H = aboutdialog.h addressbookpage.h addresstablemodel.h \
askpassphrasedialog.h bitcoinaddressvalidator.h bitcoinamountfield.h \
- bitcoingui.h bitcoinunits.h clientmodel.h csvmodelwriter.h \
+ bitcoingui.h bitcoinunits.h clientmodel.h coincontroldialog.h coincontroltreewidget.h csvmodelwriter.h \
editaddressdialog.h guiconstants.h guiutil.h intro.h macdockiconhandler.h \
macnotificationhandler.h monitoreddatamapper.h notificator.h \
openuridialog.h \
@@ -143,7 +148,10 @@ RES_ICONS = res/icons/bitcoin.png res/icons/address-book.png \
BITCOIN_QT_CPP = aboutdialog.cpp addressbookpage.cpp \
addresstablemodel.cpp askpassphrasedialog.cpp bitcoinaddressvalidator.cpp \
bitcoinamountfield.cpp bitcoin.cpp bitcoingui.cpp \
- bitcoinunits.cpp clientmodel.cpp csvmodelwriter.cpp editaddressdialog.cpp \
+ bitcoinunits.cpp clientmodel.cpp \
+ coincontroldialog.cpp \
+ coincontroltreewidget.cpp \
+ csvmodelwriter.cpp editaddressdialog.cpp \
guiutil.cpp intro.cpp monitoreddatamapper.cpp notificator.cpp \
openuridialog.cpp \
optionsdialog.cpp optionsmodel.cpp overviewpage.cpp paymentrequestplus.cpp \