Manual merge of jaromil's source tree reorg commit.
authorJeff Garzik <jeff@garzik.org>
Mon, 9 May 2011 18:00:14 +0000 (14:00 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 9 May 2011 18:00:14 +0000 (14:00 -0400)
Conflicts:
src/sha256.cpp

14 files changed:
1  2 
doc/build-unix.txt
share/setup.nsi
share/uiproject.fbp
src/db.cpp
src/init.cpp
src/main.cpp
src/main.h
src/makefile.unix
src/rpc.cpp
src/serialize.h
src/ui.cpp
src/ui.h
src/uibase.cpp
src/uibase.h

Simple merge
diff --cc share/setup.nsi
Simple merge
Simple merge
diff --cc src/db.cpp
Simple merge
diff --cc src/init.cpp
Simple merge
diff --cc src/main.cpp
Simple merge
diff --cc src/main.h
Simple merge
Simple merge
diff --cc src/rpc.cpp
Simple merge
diff --cc src/serialize.h
Simple merge
diff --cc src/ui.cpp
Simple merge
diff --cc src/ui.h
Simple merge
diff --cc src/uibase.cpp
Simple merge
diff --cc src/uibase.h
Simple merge