Skip to content

V2.0.5 - #4

Merged
PlexusCoin merged 27 commits into
masterfrom
v2.0.5
Sep 19, 2018
Merged

V2.0.5#4
PlexusCoin merged 27 commits into
masterfrom
v2.0.5

Conversation

@PlexusCoin

Copy link
Copy Markdown
Owner

No description provided.

PlexusCoin and others added 27 commits July 1, 2018 22:06
	modified:   src/rpcmisc.cpp
	modified:   src/wallet.cpp
	modified:   src/wallet.h
	modified:   src/compat/glibc_compat.cpp
	modified:   src/qt/transactionrecord.cpp
	modified:   src/rpcmisc.cpp
	modified:   src/version.h
	modified:   src/wallet.cpp
	modified:   plexus-qt.pro
	modified:   src/Makefile.qt.include
	modified:   src/miner.cpp
	modified:   src/qt/forms/addressbookpage.ui
	modified:   src/qt/forms/masternodelist.ui
	modified:   src/qt/forms/tradingdialog.ui
	modified:   src/qt/masternodelist.cpp
	modified:   src/qt/masternodelist.h
	modified:   src/qt/res/icons/tx_input.png
	modified:   src/qt/res/icons/tx_mined.png
	modified:   src/qt/res/icons/tx_output.png
	modified:   src/qt/transactionrecord.cpp
	modified:   src/qt/transactiontablemodel.cpp
	modified:   src/qt/transactionview.cpp
	modified:   src/wallet.cpp
	modified:   src/qt/forms/overviewpage.ui
	modified:   src/qt/forms/sendcoinsdialog.ui
	modified:   src/qt/guiutil.cpp
	new file:   src/qt/createmasternodedialog.h
	new file:   src/qt/forms/createmasternodedialog.ui
	modified:   src/Makefile.qt.include
	modified:   src/chainparams.cpp
	modified:   src/chainparams.h
	modified:   src/chainparamsseeds.h
	modified:   src/main.cpp
	modified:   src/main.h
	modified:   src/masternodeconfig.cpp
	modified:   src/masternodeconfig.h
	modified:   src/net.cpp
	modified:   src/obfuscation.cpp
	modified:   src/plexus-tx.cpp
	modified:   src/pow.cpp
	modified:   src/qt/bitcoingui.cpp
	modified:   src/qt/blockexplorer.cpp
	modified:   src/qt/coincontroldialog.cpp
	modified:   src/qt/createmasternodedialog.cpp
	modified:   src/qt/forms/createmasternodedialog.ui
	modified:   src/qt/forms/overviewpage.ui
	modified:   src/qt/forms/sendcoinsdialog.ui
	modified:   src/qt/guiutil.cpp
	modified:   src/qt/obfuscationconfig.cpp
	modified:   src/qt/openuridialog.cpp
	modified:   src/qt/optionsdialog.cpp
	modified:   src/qt/optionsmodel.cpp
	modified:   src/qt/paymentserver.cpp
	modified:   src/qt/plexus.qrc
	modified:   src/qt/plexusstrings.cpp
	deleted:    src/qt/res/css/default.css
	modified:   src/qt/res/icons/add.png
	modified:   src/qt/res/icons/address-book.png
	modified:   src/qt/res/icons/bitcoin.ico
	modified:   src/qt/res/icons/bitcoin.png
	modified:   src/qt/res/icons/clock1.png
	modified:   src/qt/res/icons/clock2.png
	modified:   src/qt/res/icons/clock3.png
	modified:   src/qt/res/icons/clock4.png
	modified:   src/qt/res/icons/clock5.png
	modified:   src/qt/res/icons/connect0_16.png
	modified:   src/qt/res/icons/connect1_16.png
	modified:   src/qt/res/icons/connect2_16.png
	modified:   src/qt/res/icons/connect3_16.png
	modified:   src/qt/res/icons/connect4_16.png
	modified:   src/qt/res/icons/history.png
	modified:   src/qt/res/icons/import.png
	modified:   src/qt/res/icons/key.png
	modified:   src/qt/res/icons/lock_closed.png
	modified:   src/qt/res/icons/lock_open.png
	modified:   src/qt/res/icons/masternodes.png
	modified:   src/qt/res/icons/notsynced.png
	modified:   src/qt/res/icons/overview.png
	modified:   src/qt/res/icons/quit.png
	modified:   src/qt/res/icons/receive.png
	modified:   src/qt/res/icons/remove.png
	modified:   src/qt/res/icons/send.png
	modified:   src/qt/res/icons/staking_active.png
	modified:   src/qt/res/icons/staking_inactive.png
	modified:   src/qt/res/icons/trade.png
	modified:   src/qt/res/icons/transaction0.png
	modified:   src/qt/res/icons/transaction2.png
	modified:   src/qt/res/icons/transaction_conflicted.png
	modified:   src/qt/res/icons/tx_inout.png
	modified:   src/qt/res/icons/tx_input.png
	modified:   src/qt/res/icons/tx_mined.png
	modified:   src/qt/res/icons/tx_output.png
	modified:   src/qt/res/images/about.png
	modified:   src/qt/res/images/downArrow.png
	modified:   src/qt/res/images/downArrow_small.png
	modified:   src/qt/res/images/leftArrow_small.png
	modified:   src/qt/res/images/plexus_logo_horizontal.png
	modified:   src/qt/res/images/qtreeview_selected.png
	modified:   src/qt/res/images/rightArrow_small.png
	modified:   src/qt/res/images/splash.png
	modified:   src/qt/res/images/upArrow_small.png
	modified:   src/qt/sendcoinsdialog.cpp
	modified:   src/qt/utilitydialog.cpp
	modified:   src/qt/walletmodel.cpp
	modified:   src/qt/walletview.cpp
	modified:   src/qt/walletview.h
	modified:   src/rpcblockchain.cpp
	modified:   src/rpcnet.cpp
	modified:   src/util.cpp
	new file:   src/qt/res/css/dark.css
	modified:   src/Makefile.qt.include
	modified:   src/qt/createmasternodedialog.cpp
	modified:   src/qt/guiutil.cpp
	modified:   src/qt/optionsdialog.cpp
	modified:   src/qt/plexus.qrc
	renamed:    src/qt/res/css/blue.css -> src/qt/res/css/default.css
	modified:   src/qt/forms/overviewpage.ui
	modified:   src/qt/forms/sendcoinsdialog.ui
	modified:   src/qt/guiutil.cpp
	modified:   src/qt/forms/overviewpage.ui
	modified:   src/activemasternode.h
	modified:   src/chainparams.cpp
	modified:   src/chainparamsbase.h
	modified:   src/clientversion.cpp
	modified:   src/clientversion.h
	modified:   src/coins.h
	modified:   src/main.cpp
	modified:   src/masternode-budget.h
	modified:   src/noui.cpp
	modified:   src/obfuscation.h
	modified:   src/plexus-tx.cpp
	modified:   src/qt/bitcoinunits.h
	modified:   src/qt/clientmodel.h
	modified:   src/qt/forms/overviewpage.ui
	modified:   src/qt/paymentserver.cpp
	modified:   src/qt/paymentserver.h
	modified:   src/qt/plexusstrings.cpp
	modified:   src/qt/recentrequeststablemodel.h
	modified:   src/qt/rpcconsole.h
	modified:   src/qt/sendcoinsdialog.cpp
	modified:   src/qt/sendcoinsentry.cpp
	modified:   src/qt/test/uritests.cpp
	modified:   src/qt/transactiondesc.cpp
	modified:   src/qt/transactionrecord.cpp
	modified:   src/rpcdump.cpp
	modified:   src/rpcmasternode-budget.cpp
	modified:   src/rpcmasternode.cpp
	modified:   src/rpcnet.cpp
	modified:   src/rpcprotocol.cpp
	modified:   src/rpcprotocol.h
	modified:   src/rpcserver.h
	modified:   src/rpcwallet.cpp
	modified:   src/test/test_prufus.cpp
	modified:   src/uint256.h
	modified:   src/util.h
	modified:   src/wallet.cpp
	modified:   src/wallet.h
	modified:   src/walletdb.cpp
	modified:   src/test/buildenv.py
	modified:   src/version.h
	modified:   src/qt/forms/createmasternodedialog.ui
	modified:   src/qt/forms/overviewpage.ui
	modified:   src/version.h
	modified:   share/pixmaps/favicon.ico
	modified:   share/pixmaps/favicon.ico
	modified:   src/qt/bitcoingui.cpp
	modified:   src/qt/forms/overviewpage.ui
	modified:   src/qt/res/css/dark.css
	modified:   src/qt/res/css/default.css
	modified:   src/qt/forms/overviewpage.ui
	modified:   src/qt/res/css/default.css
	modified:   src/qt/res/css/default.css
	modified:   src/qt/masternodelist.cpp
@PlexusCoin
PlexusCoin merged commit 38f6924 into master Sep 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants