Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiplatform #1

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Multiplatform #1

wants to merge 19 commits into from

Conversation

serg-z
Copy link

@serg-z serg-z commented Nov 10, 2013

Added Linux binaries.
Cleaned undesirable build files (objects, generated makefiles, moc, qm, etc.).

serg-z and others added 19 commits October 24, 2013 17:04
Conflicts:
	Makefile
	Makefile.Debug
	Makefile.Release
	build/alert.o
	build/bitcoin.o
	build/bitcoingui.o
	build/bitcoinrpc.o
	build/db.o
	build/init.o
	build/main.o
	build/moc_bitcoingui.cpp
	build/moc_bitcoingui.o
	build/net.o
	build/optionsmodel.o
	build/rpcblockchain.o
	build/rpcmining.o
	build/rpcrawtransaction.o
	build/rpcwallet.o
	build/txdb.o
	build/version.o
	build/wallet.o
	build/walletdb.o
	build/walletview.o
	prev-win32-release/boinc.pdb
Conflicts:
	Makefile
	Makefile.Debug
	Makefile.Release
	build/alert.o
	build/bitcoingui.o
	build/bitcoinrpc.o
	build/checkpoints.o
	build/db.o
	build/init.o
	build/key.o
	build/main.o
	build/net.o
	build/optionsmodel.o
	build/rpcmining.o
	build/rpcrawtransaction.o
	build/rpcwallet.o
	build/txdb.o
	build/version.o
	build/wallet.o
	build/walletdb.o
…ut dialogs form. Fixed mingw and unix makefiles. Fixed miniupnpc headers in net.cpp.
…ing implemented. Reqires libproc-dev to be installed. Counters refresh using timers. Some UI fixes. Linux executables added.
Conflicts:
	Makefile
	Makefile.Debug
	Makefile.Release
	build/aboutdialog.o
	build/addressbookpage.o
	build/alert.o
	build/bitcoin.o
	build/bitcoinamountfield.o
	build/bitcoingui.o
	build/bitcoinrpc.o
	build/db.o
	build/editaddressdialog.o
	build/init.o
	build/main.o
	build/moc_bitcoingui.cpp
	build/moc_bitcoingui.o
	build/net.o
	build/optionsdialog.o
	build/optionsmodel.o
	build/overviewpage.o
	build/qvalidatedlineedit.o
	build/rpcblockchain.o
	build/rpcconsole.o
	build/rpcmining.o
	build/rpcrawtransaction.o
	build/rpcwallet.o
	build/sendcoinsdialog.o
	build/sendcoinsentry.o
	build/splashscreen.o
	build/transactiondescdialog.o
	build/transactiontablemodel.o
	build/transactionview.o
	build/txdb.o
	build/ui_aboutdialog.h
	build/ui_addressbookpage.h
	build/ui_editaddressdialog.h
	build/ui_optionsdialog.h
	build/ui_overviewpage.h
	build/ui_rpcconsole.h
	build/ui_sendcoinsdialog.h
	build/ui_sendcoinsentry.h
	build/ui_transactiondescdialog.h
	build/version.o
	build/wallet.o
	build/walletdb.o
	build/walletview.o
	contrib/RD/GridCoinDotNet/GRCRestarter/GRCRestarter/GRCRestarter/bin/Debug/GRCRestarter.xml
	release-win32/boinc.dll
	release-win32/boinc.tlb
	release-win32/boinc.xml
	release-win32/gridcoin-qt.exe
	release/boinc.xml
	release/gridcoin.zip
	src/gridcoind.exe
	src/net.cpp.bak
	src/obj/addrman.o
	src/obj/alert.o
	src/obj/bitcoinrpc.o
	src/obj/bloom.o
	src/obj/checkpoints.o
	src/obj/crypter.o
	src/obj/db.o
	src/obj/hash.o
	src/obj/init.o
	src/obj/key.o
	src/obj/keystore.o
	src/obj/leveldb.o
	src/obj/main.o
	src/obj/net.o
	src/obj/netbase.o
	src/obj/noui.o
	src/obj/protocol.o
	src/obj/rpcblockchain.o
	src/obj/rpcdump.o
	src/obj/rpcmining.o
	src/obj/rpcnet.o
	src/obj/rpcrawtransaction.o
	src/obj/rpcwallet.o
	src/obj/script.o
	src/obj/sync.o
	src/obj/txdb.o
	src/obj/util.o
	src/obj/version.o
	src/obj/wallet.o
	src/obj/walletdb.o
	src/qt/aboutdialog.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoingui.h
	src/qt/forms/aboutdialog.ui
	src/qt/forms/overviewpage.ui
	src/qt/overviewpage.cpp
Conflicts:
	Makefile
	Makefile.Debug
	Makefile.Release
	bitcoin-qt.pro
	build/addressbookpage.o
	build/alert.o
	build/bitcoinamountfield.o
	build/bitcoingui.o
	build/bitcoinrpc.o
	build/bloom.o
	build/checkpoints.o
	build/db.o
	build/init.o
	build/main.o
	build/moc_aboutdialog.cpp
	build/moc_addressbookpage.cpp
	build/moc_addresstablemodel.cpp
	build/moc_askpassphrasedialog.cpp
	build/moc_bitcoinaddressvalidator.cpp
	build/moc_bitcoinamountfield.cpp
	build/moc_bitcoingui.cpp
	build/moc_bitcoingui.o
	build/moc_bitcoinunits.cpp
	build/moc_clientmodel.cpp
	build/moc_csvmodelwriter.cpp
	build/moc_editaddressdialog.cpp
	build/moc_guiutil.cpp
	build/moc_macnotificationhandler.cpp
	build/moc_miningdialog.cpp
	build/moc_monitoreddatamapper.cpp
	build/moc_notificator.cpp
	build/moc_optionsdialog.cpp
	build/moc_optionsmodel.cpp
	build/moc_overviewpage.cpp
	build/moc_paymentserver.cpp
	build/moc_qvalidatedlineedit.cpp
	build/moc_qvaluecombobox.cpp
	build/moc_rpcconsole.cpp
	build/moc_sendcoinsdialog.cpp
	build/moc_sendcoinsentry.cpp
	build/moc_signverifymessagedialog.cpp
	build/moc_splashscreen.cpp
	build/moc_transactiondesc.cpp
	build/moc_transactiondescdialog.cpp
	build/moc_transactionfilterproxy.cpp
	build/moc_transactiontablemodel.cpp
	build/moc_transactionview.cpp
	build/moc_walletframe.cpp
	build/moc_walletmodel.cpp
	build/moc_walletstack.cpp
	build/moc_walletview.cpp
	build/net.o
	build/overviewpage.moc
	build/rpcconsole.moc
	build/ui_aboutdialog.h
	build/ui_addressbookpage.h
	build/ui_askpassphrasedialog.h
	build/ui_editaddressdialog.h
	build/ui_miningdialog.h
	build/ui_optionsdialog.h
	build/ui_overviewpage.h
	build/ui_rpcconsole.h
	build/ui_sendcoinsdialog.h
	build/ui_sendcoinsentry.h
	build/ui_signverifymessagedialog.h
	build/ui_transactiondescdialog.h
	contrib/RD/GridCoinDotNet/GRCRestarter/Scrypt/Project1/bin/Release/Project1.vshost.exe.manifest
	release-linux/gridcoin-qt
	release-win32/boinc.vshost.exe.manifest
	release-win32/boinc2.dll
	release-win32/boinc2.pdb
	release-win32/boinc2.tlb
	release-win32/boinc2.xml
	release/boinc.dll
	release/boinc.vshost.exe.manifest
	release/boinc.xml
	release/boinc2.dll
	release/boinc2.xml
	release/qrc_bitcoin.cpp
	src/init.cpp
	src/net.cpp.bak
	src/qt/bitcoingui.cpp
	src/qt/bitcoingui.h
	src/qt/miningdialog.cpp
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.

1 participant