Created
February 18, 2014 20:52
-
-
Save davispuh/9079817 to your computer and use it in GitHub Desktop.
Namecoin conflicts when merged in Bitcoin master branch
We can make this file beautiful and searchable if this error is corrected: No commas found in this CSV file in line 0.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File Name;Path;Count | |
.gitignore;namecoin;2 | |
COPYING;namecoin;2 | |
README.md;namecoin;2 | |
allocators.h;namecoin\src;8 | |
base58.h;namecoin\src;1 | |
bitcoinrpc.cpp;namecoin\src;1 | |
crypter.cpp;namecoin\src;4 | |
crypter.h;namecoin\src;4 | |
db.cpp;namecoin\src;17 | |
db.h;namecoin\src;3 | |
init.cpp;namecoin\src;29 | |
init.h;namecoin\src;1 | |
key.cpp;namecoin\src;3 | |
key.h;namecoin\src;6 | |
keystore.cpp;namecoin\src;2 | |
keystore.h;namecoin\src;3 | |
main.cpp;namecoin\src;43 | |
main.h;namecoin\src;29 | |
makefile.unix;namecoin\src;1 | |
namecoin.cpp;namecoin\src;2 | |
net.cpp;namecoin\src;11 | |
net.h;namecoin\src;4 | |
noui.h;namecoin\src;1 | |
script.cpp;namecoin\src;10 | |
script.h;namecoin\src;4 | |
serialize.h;namecoin\src;2 | |
util.cpp;namecoin\src;19 | |
util.h;namecoin\src;10 | |
wallet.cpp;namecoin\src;56 | |
wallet.h;namecoin\src;32 | |
walletdb.cpp;namecoin\src;12 | |
walletdb.h;namecoin\src;2 | |
addressbookpage.cpp;namecoin\src\qt;29 | |
addressbookpage.h;namecoin\src\qt;7 | |
addresstablemodel.cpp;namecoin\src\qt;22 | |
addresstablemodel.h;namecoin\src\qt;3 | |
askpassphrasedialog.cpp;namecoin\src\qt;3 | |
askpassphrasedialog.h;namecoin\src\qt;4 | |
bitcoin.cpp;namecoin\src\qt;11 | |
bitcoin.qrc;namecoin\src\qt;3 | |
bitcoinaddressvalidator.cpp;namecoin\src\qt;10 | |
bitcoinaddressvalidator.h;namecoin\src\qt;9 | |
bitcoinamountfield.cpp;namecoin\src\qt;7 | |
bitcoinamountfield.h;namecoin\src\qt;3 | |
bitcoingui.cpp;namecoin\src\qt;70 | |
bitcoingui.h;namecoin\src\qt;19 | |
bitcoinstrings.cpp;namecoin\src\qt;24 | |
bitcoinunits.cpp;namecoin\src\qt;2 | |
bitcoinunits.h;namecoin\src\qt;2 | |
clientmodel.cpp;namecoin\src\qt;13 | |
clientmodel.h;namecoin\src\qt;6 | |
csvmodelwriter.cpp;namecoin\src\qt;2 | |
csvmodelwriter.h;namecoin\src\qt;1 | |
editaddressdialog.cpp;namecoin\src\qt;4 | |
editaddressdialog.h;namecoin\src\qt;3 | |
guiconstants.h;namecoin\src\qt;3 | |
guiutil.cpp;namecoin\src\qt;22 | |
guiutil.h;namecoin\src\qt;7 | |
macdockiconhandler.h;namecoin\src\qt;1 | |
macdockiconhandler.mm;namecoin\src\qt;5 | |
monitoreddatamapper.cpp;namecoin\src\qt;1 | |
monitoreddatamapper.h;namecoin\src\qt;1 | |
notificator.cpp;namecoin\src\qt;5 | |
notificator.h;namecoin\src\qt;4 | |
optionsdialog.cpp;namecoin\src\qt;19 | |
optionsdialog.h;namecoin\src\qt;5 | |
optionsmodel.cpp;namecoin\src\qt;13 | |
optionsmodel.h;namecoin\src\qt;6 | |
overviewpage.cpp;namecoin\src\qt;3 | |
overviewpage.h;namecoin\src\qt;2 | |
paymentserver.cpp;namecoin\src\qt;13 | |
paymentserver.h;namecoin\src\qt;6 | |
qvalidatedlineedit.cpp;namecoin\src\qt;3 | |
qvalidatedlineedit.h;namecoin\src\qt;2 | |
qvaluecombobox.cpp;namecoin\src\qt;1 | |
qvaluecombobox.h;namecoin\src\qt;1 | |
rpcconsole.cpp;namecoin\src\qt;14 | |
rpcconsole.h;namecoin\src\qt;6 | |
sendcoinsdialog.cpp;namecoin\src\qt;16 | |
sendcoinsdialog.h;namecoin\src\qt;6 | |
sendcoinsentry.cpp;namecoin\src\qt;14 | |
sendcoinsentry.h;namecoin\src\qt;6 | |
signverifymessagedialog.cpp;namecoin\src\qt;17 | |
signverifymessagedialog.h;namecoin\src\qt;3 | |
splashscreen.cpp;namecoin\src\qt;5 | |
splashscreen.h;namecoin\src\qt;2 | |
transactiondesc.cpp;namecoin\src\qt;18 | |
transactiondesc.h;namecoin\src\qt;2 | |
transactiondescdialog.cpp;namecoin\src\qt;1 | |
transactiondescdialog.h;namecoin\src\qt;1 | |
transactionfilterproxy.cpp;namecoin\src\qt;4 | |
transactionfilterproxy.h;namecoin\src\qt;3 | |
transactionrecord.cpp;namecoin\src\qt;18 | |
transactionrecord.h;namecoin\src\qt;8 | |
transactiontablemodel.cpp;namecoin\src\qt;20 | |
transactiontablemodel.h;namecoin\src\qt;3 | |
transactionview.cpp;namecoin\src\qt;8 | |
transactionview.h;namecoin\src\qt;3 | |
walletframe.cpp;namecoin\src\qt;17 | |
walletframe.h;namecoin\src\qt;7 | |
walletmodel.cpp;namecoin\src\qt;21 | |
walletmodel.h;namecoin\src\qt;11 | |
walletview.cpp;namecoin\src\qt;18 | |
walletview.h;namecoin\src\qt;9 | |
aboutdialog.ui;namecoin\src\qt\forms;8 | |
addressbookpage.ui;namecoin\src\qt\forms;7 | |
askpassphrasedialog.ui;namecoin\src\qt\forms;2 | |
editaddressdialog.ui;namecoin\src\qt\forms;5 | |
optionsdialog.ui;namecoin\src\qt\forms;23 | |
overviewpage.ui;namecoin\src\qt\forms;8 | |
rpcconsole.ui;namecoin\src\qt\forms;11 | |
sendcoinsdialog.ui;namecoin\src\qt\forms;10 | |
sendcoinsentry.ui;namecoin\src\qt\forms;2 | |
signverifymessagedialog.ui;namecoin\src\qt\forms;5 | |
transactiondescdialog.ui;namecoin\src\qt\forms;2 | |
bitcoin_af_ZA.ts;namecoin\src\qt\locale;353 | |
bitcoin_ar.ts;namecoin\src\qt\locale;482 | |
bitcoin_bg.ts;namecoin\src\qt\locale;381 | |
bitcoin_bs.ts;namecoin\src\qt\locale;206 | |
bitcoin_ca.ts;namecoin\src\qt\locale;212 | |
bitcoin_ca_ES.ts;namecoin\src\qt\locale;360 | |
bitcoin_cs.ts;namecoin\src\qt\locale;386 | |
bitcoin_cy.ts;namecoin\src\qt\locale;206 | |
bitcoin_da.ts;namecoin\src\qt\locale;371 | |
bitcoin_de.ts;namecoin\src\qt\locale;421 | |
bitcoin_el_GR.ts;namecoin\src\qt\locale;382 | |
bitcoin_en.ts;namecoin\src\qt\locale;415 | |
bitcoin_eo.ts;namecoin\src\qt\locale;238 | |
bitcoin_es.ts;namecoin\src\qt\locale;382 | |
bitcoin_es_CL.ts;namecoin\src\qt\locale;395 | |
bitcoin_et.ts;namecoin\src\qt\locale;363 | |
bitcoin_eu_ES.ts;namecoin\src\qt\locale;382 | |
bitcoin_fa.ts;namecoin\src\qt\locale;414 | |
bitcoin_fa_IR.ts;namecoin\src\qt\locale;397 | |
bitcoin_fi.ts;namecoin\src\qt\locale;368 | |
bitcoin_fr.ts;namecoin\src\qt\locale;392 | |
bitcoin_fr_CA.ts;namecoin\src\qt\locale;392 | |
bitcoin_gu_IN.ts;namecoin\src\qt\locale;387 | |
bitcoin_he.ts;namecoin\src\qt\locale;374 | |
bitcoin_hi_IN.ts;namecoin\src\qt\locale;368 | |
bitcoin_hr.ts;namecoin\src\qt\locale;398 | |
bitcoin_hu.ts;namecoin\src\qt\locale;409 | |
bitcoin_it.ts;namecoin\src\qt\locale;421 | |
bitcoin_ja.ts;namecoin\src\qt\locale;453 | |
bitcoin_la.ts;namecoin\src\qt\locale;189 | |
bitcoin_lt.ts;namecoin\src\qt\locale;395 | |
bitcoin_lv_LV.ts;namecoin\src\qt\locale;187 | |
bitcoin_nb.ts;namecoin\src\qt\locale;410 | |
bitcoin_nl.ts;namecoin\src\qt\locale;385 | |
bitcoin_pl.ts;namecoin\src\qt\locale;403 | |
bitcoin_pt_BR.ts;namecoin\src\qt\locale;371 | |
bitcoin_pt_PT.ts;namecoin\src\qt\locale;396 | |
bitcoin_ro_RO.ts;namecoin\src\qt\locale;386 | |
bitcoin_ru.ts;namecoin\src\qt\locale;365 | |
bitcoin_sk.ts;namecoin\src\qt\locale;405 | |
bitcoin_sr.ts;namecoin\src\qt\locale;404 | |
bitcoin_sv.ts;namecoin\src\qt\locale;379 | |
bitcoin_th_TH.ts;namecoin\src\qt\locale;391 | |
bitcoin_tr.ts;namecoin\src\qt\locale;361 | |
bitcoin_uk.ts;namecoin\src\qt\locale;418 | |
bitcoin_zh_CN.ts;namecoin\src\qt\locale;384 | |
bitcoin_zh_TW.ts;namecoin\src\qt\locale;400 | |
test_main.cpp;namecoin\src\qt\test;2 | |
uritests.cpp;namecoin\src\qt\test;2 | |
uritests.h;namecoin\src\qt\test;1 | |
bitcoin.svg;namecoin\src\qt\res\src;1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment