first commit
First Change
Delete bitcoind.bash-completion
Second Change
Merge branch 'master' of https://github.com/OpusCoin/Opus-Coin
Changes1
Merge branch 'master' of https://github.com/OpusCoin/OpusCoinDev

Conflicts:
	COPYING
	INSTALL
	README.md
	contrib/bitrpc/bitrpc.py
	contrib/debian/changelog
	contrib/debian/control
	contrib/debian/copyright
	contrib/debian/rules
	contrib/debian/watch
	contrib/gitian-descriptors/README
	contrib/gitian-downloader/linux-download-config
	contrib/gitian-downloader/win32-download-config
	contrib/macdeploy/background.png
	contrib/macdeploy/background.psd
	contrib/macdeploy/fancy.plist
	contrib/macdeploy/macdeployqtplus
	contrib/macdeploy/notes.txt
	contrib/pyminer/README
	contrib/pyminer/example-config.cfg
	contrib/pyminer/pyminer.py
	contrib/qt_translations.py
	contrib/wallettools/walletchangepass.py
	contrib/wallettools/walletunlock.py
	doc/Doxyfile
	doc/README
	doc/README_windows.txt
	doc/Tor.txt
	doc/assets-attribution.txt
	doc/build-msw.txt
	doc/build-osx.txt
	doc/build-unix.txt
	doc/coding.txt
	doc/readme-qt.rst
	doc/release-process.txt
	doc/translation_process.md
	doc/unit-tests.txt
	share/pixmaps/favicon.ico
	share/pixmaps/nsis-header.bmp
	share/pixmaps/nsis-wizard.bmp
	share/qt/extract_strings_qt.py
	share/qt/make_windows_icon.sh
	share/setup.nsi
	share/ui.rc
	src/addrman.cpp
	src/addrman.h
	src/allocators.h
	src/base58.h
	src/bignum.h
	src/checkpoints.cpp
	src/checkpoints.h
	src/compat.h
	src/crypter.cpp
	src/crypter.h
	src/db.cpp
	src/db.h
	src/init.cpp
	src/init.h
	src/irc.cpp
	src/irc.h
	src/json/json_spirit_value.h
	src/json/json_spirit_writer_template.h
	src/key.cpp
	src/key.h
	src/keystore.cpp
	src/keystore.h
	src/main.cpp
	src/main.h
	src/makefile.linux-mingw
	src/makefile.mingw
	src/makefile.osx
	src/makefile.unix
	src/mruset.h
	src/net.cpp
	src/net.h
	src/netbase.cpp
	src/netbase.h
	src/noui.cpp
	src/protocol.cpp
	src/protocol.h
	src/qt/addressbookpage.cpp
	src/qt/addressbookpage.h
	src/qt/addresstablemodel.cpp
	src/qt/addresstablemodel.h
	src/qt/askpassphrasedialog.cpp
	src/qt/clientmodel.cpp
	src/qt/clientmodel.h
	src/qt/editaddressdialog.cpp
	src/qt/forms/aboutdialog.ui
	src/qt/forms/addressbookpage.ui
	src/qt/forms/optionsdialog.ui
	src/qt/forms/overviewpage.ui
	src/qt/forms/qrcodedialog.ui
	src/qt/forms/rpcconsole.ui
	src/qt/forms/sendcoinsdialog.ui
	src/qt/forms/sendcoinsentry.ui
	src/qt/forms/signverifymessagedialog.ui
	src/qt/guiconstants.h
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/macdockiconhandler.h
	src/qt/macdockiconhandler.mm
	src/qt/notificator.cpp
	src/qt/notificator.h
	src/qt/optionsdialog.cpp
	src/qt/optionsdialog.h
	src/qt/optionsmodel.cpp
	src/qt/optionsmodel.h
	src/qt/overviewpage.cpp
	src/qt/overviewpage.h
	src/qt/qrcodedialog.cpp
	src/qt/qtipcserver.cpp
	src/qt/qtipcserver.h
	src/qt/res/icons/address-book.png
	src/qt/res/icons/filesave.png
	src/qt/res/icons/history.png
	src/qt/res/icons/overview.png
	src/qt/res/icons/receive.png
	src/qt/res/icons/send.png
	src/qt/res/icons/toolbar.png
	src/qt/res/icons/toolbar_testnet.png
	src/qt/res/images/about.png
	src/qt/res/images/splash2.jpg
	src/qt/res/src/inout.svg
	src/qt/res/src/questionmark.svg
	src/qt/rpcconsole.cpp
	src/qt/rpcconsole.h
	src/qt/sendcoinsdialog.cpp
	src/qt/sendcoinsdialog.h
	src/qt/sendcoinsentry.cpp
	src/qt/sendcoinsentry.h
	src/qt/signverifymessagedialog.cpp
	src/qt/test/test_main.cpp
	src/qt/test/uritests.cpp
	src/qt/transactiondesc.cpp
	src/qt/transactionfilterproxy.cpp
	src/qt/transactionfilterproxy.h
	src/qt/transactionrecord.cpp
	src/qt/transactionrecord.h
	src/qt/transactiontablemodel.cpp
	src/qt/transactiontablemodel.h
	src/qt/transactionview.cpp
	src/qt/transactionview.h
	src/qt/walletmodel.cpp
	src/qt/walletmodel.h
	src/rpcdump.cpp
	src/rpcnet.cpp
	src/rpcrawtransaction.cpp
	src/script.cpp
	src/script.h
	src/serialize.h
	src/sync.cpp
	src/sync.h
	src/test/Checkpoints_tests.cpp
	src/test/DoS_tests.cpp
	src/test/README
	src/test/base58_tests.cpp
	src/test/bignum_tests.cpp
	src/test/data/script_invalid.json
	src/test/data/script_valid.json
	src/test/getarg_tests.cpp
	src/test/key_tests.cpp
	src/test/miner_tests.cpp
	src/test/multisig_tests.cpp
	src/test/netbase_tests.cpp
	src/test/rpc_tests.cpp
	src/test/script_P2SH_tests.cpp
	src/test/script_tests.cpp
	src/test/transaction_tests.cpp
	src/test/util_tests.cpp
	src/test/wallet_tests.cpp
	src/ui_interface.h
	src/uint256.h
	src/util.cpp
	src/util.h
	src/version.cpp
	src/version.h
	src/wallet.cpp
	src/wallet.h
	src/walletdb.cpp
	src/walletdb.h