Merge branch '0.6.x' of git://gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.3

This commit is contained in:
Gavin Andresen
2012-06-19 16:34:10 -04:00
67 changed files with 200 additions and 130 deletions

View File

@@ -69,7 +69,7 @@ OBJS= \
all: bitcoind.exe
obj/build.h: FORCE
../share/genbuild.sh obj/build.h
/bin/sh ../share/genbuild.sh obj/build.h
version.cpp: obj/build.h
DEFS += -DHAVE_BUILD_INFO