Wladimir J. van der Laan 491ad6db50 Merge remote branch 'upstream/master' ...

Conflicts:
	src/bitcoinrpc.cpp

2011-07-26 16:47:23 +02:00

..

forms

…

locale

…

res

…

aboutdialog.cpp

…

aboutdialog.h

…

addressbookpage.cpp

…

addressbookpage.h

…

addresstablemodel.cpp

Merge remote branch 'upstream/master'

2011-07-26 16:47:23 +02:00

addresstablemodel.h

…

bitcoin.cpp

…

bitcoin.qrc

…

bitcoinaddressvalidator.cpp

…

bitcoinaddressvalidator.h

…

bitcoinamountfield.cpp

Reset unit to default when clearing the field, to prevent confusion

2011-07-26 13:31:59 +02:00

bitcoinamountfield.h

allow multiple units in bitcoin amount widget (for example, for sending) using a combobox

2011-07-26 13:08:34 +02:00

bitcoingui.cpp

preparations for multiple unit (uBTC, mBTC, BTC) support, fix amount entry issue

2011-07-25 21:38:54 +02:00

bitcoingui.h

…

bitcoinstrings.cpp

…

bitcoinunits.cpp

refuse to format nor parse invalid units

2011-07-26 13:27:33 +02:00

bitcoinunits.h

refuse to format nor parse invalid units

2011-07-26 13:27:33 +02:00

clientmodel.cpp

…

clientmodel.h

…

csvmodelwriter.cpp

…

csvmodelwriter.h

…

editaddressdialog.cpp

…

editaddressdialog.h

…

guiconstants.h

Negative transaction color changed to red (was grey due to mistake)

2011-07-26 09:16:50 +02:00

guiutil.cpp

preparations for multiple unit (uBTC, mBTC, BTC) support, fix amount entry issue

2011-07-25 21:38:54 +02:00

guiutil.h

preparations for multiple unit (uBTC, mBTC, BTC) support, fix amount entry issue

2011-07-25 21:38:54 +02:00

monitoreddatamapper.cpp

…

monitoreddatamapper.h

…

optionsdialog.cpp

allow multiple units in bitcoin amount widget (for example, for sending) using a combobox

2011-07-26 13:08:34 +02:00

optionsdialog.h

preparations for multiple unit (uBTC, mBTC, BTC) support, fix amount entry issue

2011-07-25 21:38:54 +02:00

optionsmodel.cpp

allow multiple units in bitcoin amount widget (for example, for sending) using a combobox

2011-07-26 13:08:34 +02:00

optionsmodel.h

allow multiple units in bitcoin amount widget (for example, for sending) using a combobox

2011-07-26 13:08:34 +02:00

overviewpage.cpp

preparations for multiple unit (uBTC, mBTC, BTC) support, fix amount entry issue

2011-07-25 21:38:54 +02:00

overviewpage.h

…

qtwin.cpp

…

qtwin.h

…

qvalidatedlineedit.cpp

…

qvalidatedlineedit.h

…

sendcoinsdialog.cpp

preparations for multiple unit (uBTC, mBTC, BTC) support, fix amount entry issue

2011-07-25 21:38:54 +02:00

sendcoinsdialog.h

…

sendcoinsentry.cpp

allow multiple units in bitcoin amount widget (for example, for sending) using a combobox

2011-07-26 13:08:34 +02:00

sendcoinsentry.h

…

transactiondesc.cpp

Merge remote branch 'upstream/master'

2011-07-26 16:47:23 +02:00

transactiondesc.h

…

transactiondescdialog.cpp

…

transactiondescdialog.h

…

transactionfilterproxy.cpp

…

transactionfilterproxy.h

…

transactionrecord.cpp

Merge remote branch 'upstream/master'

2011-07-26 16:47:23 +02:00

transactionrecord.h

…

transactiontablemodel.cpp

preparations for multiple unit (uBTC, mBTC, BTC) support, fix amount entry issue

2011-07-25 21:38:54 +02:00

transactiontablemodel.h

…

transactionview.cpp

preparations for multiple unit (uBTC, mBTC, BTC) support, fix amount entry issue

2011-07-25 21:38:54 +02:00

transactionview.h

…

walletmodel.cpp

Merge remote branch 'upstream/master'

2011-07-26 16:47:23 +02:00

walletmodel.h

…