summaryrefslogtreecommitdiffstats
path: root/src/Daemon/Daemon.cpp
diff options
context:
space:
mode:
authorJiri Moskovcak <jmoskovc@redhat.com>2009-05-12 15:55:34 +0200
committerJiri Moskovcak <jmoskovc@redhat.com>2009-05-12 15:55:34 +0200
commitb6bc6d13eed2f346414d731ecb29579a719556f3 (patch)
treeb429d87c2dc7a7b97e2ee4fe19a2e1c1a5b1180d /src/Daemon/Daemon.cpp
parentf92d9b70a2cb12451f2df00a5a2f9a47e2b9c5ce (diff)
parent6b77cb82cb7b918660435effb0fe356401bfdd55 (diff)
downloadabrt-b6bc6d13eed2f346414d731ecb29579a719556f3.tar.gz
abrt-b6bc6d13eed2f346414d731ecb29579a719556f3.tar.xz
abrt-b6bc6d13eed2f346414d731ecb29579a719556f3.zip
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Conflicts: src/Daemon/Daemon.cpp
Diffstat (limited to 'src/Daemon/Daemon.cpp')
-rw-r--r--src/Daemon/Daemon.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 96914d15..f8d01de4 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -21,7 +21,7 @@
#include <iostream>
#include <cstdio>
-CCrashWatcher *g_pCrashWatcher;
+CCrashWatcher *g_pCrashWatcher = NULL;
void terminate(int signal)
{