aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorLuke Dashjr <[email protected]>2012-06-14 18:13:46 +0000
committerLuke Dashjr <[email protected]>2012-06-14 18:13:46 +0000
commit6ec9d30905e8df77e60d0195074920271abb977a (patch)
tree59b21a9be7282b5ee3a2dc6c0b4f2d5a31882904 /src/test
parentBugfix: Allow tray icon to linger until Bitcoin-Qt shuts down completely. Fix... (diff)
parentMerge branch '0.4.x' into 0.5.x (diff)
downloaddiscoin-6ec9d30905e8df77e60d0195074920271abb977a.tar.xz
discoin-6ec9d30905e8df77e60d0195074920271abb977a.zip
Merge branch '0.5.x' into 0.6.0.x
Conflicts: src/main.h src/net.cpp src/serialize.h
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_bitcoin.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
index 7ff7545ab..c7e4bdd55 100644
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -26,3 +26,9 @@ void Shutdown(void* parg)
{
exit(0);
}
+
+void StartShutdown()
+{
+ exit(0);
+}
+