git.novaco.in Git - novacoin.git/commit - src/qt/addresstablemodel.cpp

git://git.novaco.in / novacoin.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a24b236 5b0fc31)

author	Wladimir J. van der Laan <laanwj@gmail.com>
	Fri, 15 Jul 2011 14:08:38 +0000 (16:08 +0200)
committer	Wladimir J. van der Laan <laanwj@gmail.com>
	Fri, 15 Jul 2011 14:42:44 +0000 (16:42 +0200)
commit	d4211176208b5e4ae4a699c6ce3239447752cdb2
tree	2f1c91d534d1571e3a04c000d66590964bbc213e	tree \| snapshot
parent	a24b23622e504f5134dd8011af5bbe68cb9443f1	commit \| diff
parent	5b0fc31b1c3d25039262ae2043474b35c14bd30b	commit \| diff

Merge branch 'master' of https://github.com/bitcoin/bitcoin

bitcoin-qt.pro	diff1 \|	\|	blob \| history
src/bitcoinrpc.cpp	diff1 \|	diff2 \|	blob \| history
src/init.cpp	diff1 \|	diff2 \|	blob \| history
src/net.h	diff1 \|	diff2 \|	blob \| history
src/qt/addresstablemodel.cpp	diff1 \|	\|	blob \| history
src/util.cpp	diff1 \|	diff2 \|	blob \| history
src/util.h	diff1 \|	diff2 \|	blob \| history
src/wallet.cpp	diff1 \|	diff2 \|	blob \| history
src/wallet.h	diff1 \|	diff2 \|	blob \| history

Novacoin client