8000 Merge Dev v0.2 by nopslide · Pull Request #16 · firoorg/firo · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Merge Dev v0.2 #16

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

Merged
merged 2 commits into from
Oct 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
zcoin-qt
build/*
!build/.gitkeep
src/obj/*
src/zcoind
Empty file added build/.gitkeep
Empty file.
Binary file removed build/Accumulator.o
Binary file not shown.
Binary file removed build/AccumulatorProofOfKnowledge.o
Binary file not shown.
Binary file removed build/Coin.o
Binary file not shown.
Binary file removed build/CoinSpend.o
Binary file not shown.
Binary file removed build/Commitment.o
Binary file not shown.
Binary file removed build/Lyra2.o
Binary file not shown.
Binary file removed build/ParamGeneration.o
Binary file not shown.
Binary file removed build/Params.o
Binary file not shown.
Binary file removed build/SerialNumberSignatureOfKnowledge.o
Binary file not shown.
Binary file removed build/SpendMetaData.o
Binary file not shown.
Binary file removed build/Sponge.o
Binary file not shown.
Binary file removed build/aboutdialog.o
Binary file not shown.
Binary file removed build/addressbookpage.o
Binary file not shown.
Binary file removed build/addresstablemodel.o
Binary file not shown.
Binary file removed build/addrman.o
Binary file not shown.
Binary file removed build/alert.o
Binary file not shown.
Binary file removed build/askpassphrasedialog.o
Binary file not shown.
Binary file removed build/auxpow.o
Binary file not shown.
Binary file removed build/bitcoin.o
Binary file not shown.
Binary file removed build/bitcoinaddressvalidator.o
Binary file not shown.
Binary file removed build/bitcoinamountfield.o
Binary file not shown.
Binary file removed build/bitcoingui.o
Binary file not shown.
Binary file removed build/bitcoinrpc.o
Binary file not shown.
Binary file removed build/bitcoinstrings.o
Binary file not shown.
Binary file removed build/bitcoinunits.o
Binary file not shown.
Binary file removed build/bloom.o
Binary file not shown.
2 changes: 0 additions & 2 deletions build/build.h

This file was deleted.

Binary file removed build/checkpoints.o
Binary file not shown.
Binary file removed build/clientmodel.o
Binary file not shown.
Binary file removed build/coincontroldialog.o
Binary file not shown.
Binary file removed build/coincontroltreewidget.o
Binary file not shown.
Binary file removed build/crypter.o
Binary file not shown.
Binary file removed build/csvmodelwriter.o
Binary file not shown.
Binary file removed build/db.o
Binary file not shown.
Binary file removed build/editaddressdialog.o
Binary file not shown.
Binary file removed build/guiutil.o
Binary file not shown.
Binary file removed build/hash.o
Binary file not shown.
Binary file removed build/init.o
Binary file not shown.
Binary file removed build/key.o
Binary file not shown.
Binary file removed build/keystore.o
Binary file not shown.
Binary file removed build/leveldb.o
Binary file not shown.
Binary file removed build/main.o
Binary file not shown.
93 changes: 0 additions & 93 deletions build/moc_aboutdialog.cpp

This file was deleted.

Binary file removed build/moc_aboutdialog.o
Binary file not shown.
165 changes: 0 additions & 165 deletions build/moc_addressbookpage.cpp

This file was deleted.

Binary file removed build/moc_addressbookpage.o
Binary file not shown.
110 changes: 0 additions & 110 deletions build/moc_addresstablemodel.cpp

This file was deleted.

Binary file removed build/moc_addresstablemodel.o
Binary file not shown.
Loading
0