diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:35:44 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-08-12 17:35:44 +0000 |
| commit | 4fb6e53968c38a3bbfa9cfa728da1d31fe3dd3fe (patch) | |
| tree | 449f4009f16f8897e7bdd37dafea4f4bd6e28e61 /src/init.cpp | |
| parent | 3171daef6c106023a5fcbc80e66c0e0a9552c4d8 (diff) | |
| parent | 566f556c40069ed06c8b734433a2859f4917d242 (diff) | |
| download | bitcoin-4fb6e53968c38a3bbfa9cfa728da1d31fe3dd3fe.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
doc/unit-tests.txt
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index 27e709a6ea..c147732d09 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -79,7 +79,7 @@ void Shutdown(void* parg) printf("Bitcoin exiting\n\n"); fExit = true; #ifndef QT_GUI - // ensure non-UI client get's exited here, but let Bitcoin-Qt reach return 0; in bitcoin.cpp + // ensure non-UI client gets exited here, but let Bitcoin-Qt reach 'return 0;' in bitcoin.cpp exit(0); #endif } |