diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:13:46 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:13:46 +0000 |
| commit | 6ec9d30905e8df77e60d0195074920271abb977a (patch) | |
| tree | 59b21a9be7282b5ee3a2dc6c0b4f2d5a31882904 /src/init.h | |
| parent | 722ff53718333dc290760d528b7a561d29ab41a8 (diff) | |
| parent | 3703150d56ff6ee557ab330e55637c9c23835902 (diff) | |
| download | bitcoin-6ec9d30905e8df77e60d0195074920271abb977a.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.h
src/net.cpp
src/serialize.h
Diffstat (limited to 'src/init.h')
| -rw-r--r-- | src/init.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/init.h b/src/init.h index 80894827a0..f038d7b621 100644 --- a/src/init.h +++ b/src/init.h @@ -7,6 +7,7 @@ extern CWallet* pwalletMain; +void StartShutdown(); void Shutdown(void* parg); bool AppInit(int argc, char* argv[]); bool AppInit2(int argc, char* argv[]); |