git.novaco.in Git - novacoin.git/commit

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

summary | shortlog | log | commit | commitdiff | tree
(merge: c0430f4 84c3fb0)

author	Jeff Garzik <jeff@garzik.org>
	Mon, 9 May 2011 18:00:14 +0000 (14:00 -0400)
committer	Jeff Garzik <jgarzik@pobox.com>
	Mon, 9 May 2011 18:00:14 +0000 (14:00 -0400)
commit	b17be7e14b4a62b7935c75fe7e7645e736fd68d2
tree	be44c7310683df72aeb5781ec74a85451206cfbc	tree \| snapshot
parent	c0430f42b868dbf996a416d3a9d81d1c8c07e47c	commit \| diff
parent	84c3fb07b0b8199c7f85c5de280e7100bad0786f	commit \| diff

Manual merge of jaromil's source tree reorg commit.

Conflicts:
src/sha256.cpp

14 files changed:

doc/build-unix.txt	diff1 \|	diff2 \|	blob \| history
share/setup.nsi	diff1 \|	diff2 \|	blob \| history
share/uiproject.fbp	diff1 \|	diff2 \|	blob \| history
src/db.cpp	diff1 \|	diff2 \|	blob \| history
src/init.cpp	diff1 \|	diff2 \|	blob \| history
src/main.cpp	diff1 \|	diff2 \|	blob \| history
src/main.h	diff1 \|	diff2 \|	blob \| history
src/makefile.unix	diff1 \|	diff2 \|	blob \| history
src/rpc.cpp	diff1 \|	diff2 \|	blob \| history
src/serialize.h	diff1 \|	diff2 \|	blob \| history
src/ui.cpp	diff1 \|	diff2 \|	blob \| history
src/ui.h	diff1 \|	diff2 \|	blob \| history
src/uibase.cpp	diff1 \|	diff2 \|	blob \| history
src/uibase.h	diff1 \|	diff2 \|	blob \| history

Novacoin client