git://git.novaco.in / novacoin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d753427 d67b043)
Merge branch '0.6.0.x' into 0.6.x
authorLuke Dashjr <luke-jr+git@utopios.org>
Tue, 22 May 2012 23:07:46 +0000 (23:07 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Tue, 22 May 2012 23:07:46 +0000 (23:07 +0000)
commita49927a46d578d142411c52b17c6f11bb19da03d
tree90f2c7ecaee23e2e9539e9264a44c803290cff4etree | snapshot
parentd7534272c62583320dc8d4a1ea71a41c715ef559commit | diff
parentd67b0434f24a629372000b0bd573ea9013ca3d90commit | diff
Merge branch '0.6.0.x' into 0.6.x

Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/bitcoinrpc.h
src/db.h
src/headers.h
src/init.cpp
src/main.cpp
src/main.h
src/noui.h
src/qt/bitcoin.cpp
src/qt/locale/bitcoin_en.ts
src/qt/walletmodel.cpp
src/script.cpp
src/ui_interface.h
src/util.cpp
.gitignore diff1 | diff2 | blob | history
src/bitcoinrpc.cpp diff1 | diff2 | blob | history
src/db.cpp diff1 | diff2 | blob | history
src/db.h diff1 | diff2 | blob | history
src/main.cpp diff1 | diff2 | blob | history
src/main.h diff1 | diff2 | blob | history
src/qt/bitcoingui.cpp diff1 | diff2 | blob | history
src/qt/optionsdialog.cpp diff1 | diff2 | blob | history
src/wallet.cpp diff1 | diff2 | blob | history
Novacoin client