Merge branch 'code-cleanup' of git://github.com/muggenhor/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Thu, 1 Sep 2011 15:52:07 +0000 (11:52 -0400)
committerGavin Andresen <gavinandresen@gmail.com>
Thu, 1 Sep 2011 15:52:07 +0000 (11:52 -0400)
commitdd7868364d9a14349ff82f74fc451db5e6b6b7b9
treeed4142635ca823364fd272a010200380b8776412
parentf662cefd8552f07548dcca9dcf84a952650fab6f
parente4dde849ae5544383703ef2d73592677e6c528ad
Merge branch 'code-cleanup' of git://github.com/muggenhor/bitcoin
src/main.cpp
src/makefile.linux-mingw
src/makefile.mingw
src/makefile.osx
src/makefile.unix
src/net.cpp