dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	src/qt/overviewpage.cpp
	src/qt/transactiondesc.cpp
This commit is contained in:
Roy Badami
2014-07-07 22:06:21 +01:00
parent 2e4fee2ac4 1fedd65fcf
commit 96df327834
331 changed files with 19565 additions and 8435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/transactionview.cpp
View File

@@ -311,7 +311,7 @@ void TransactionView::exportClicked()
writer.addColumn(tr("Type"), TransactionTableModel::Type, Qt::EditRole);
writer.addColumn(tr("Label"), 0, TransactionTableModel::LabelRole);
writer.addColumn(tr("Address"), 0, TransactionTableModel::AddressRole);
writer.addColumn(tr("Amount"), 0, TransactionTableModel::FormattedAmountRole);
writer.addColumn(BitcoinUnits::getAmountColumnTitle(model->getOptionsModel()->getDisplayUnit()), 0, TransactionTableModel::FormattedAmountRole);
writer.addColumn(tr("ID"), 0, TransactionTableModel::TxIDRole);
if(!writer.write()) {