Merge branch 'master' into chaz

[chaz/openbox] / openbox / ping.h

diff --git a/openbox/ping.h b/openbox/ping.h
index 1333ea0fa09c785d4f3311eafce1260a4394b29a..ceb0bdb0d269697d25968bd8cfa94b85e9ccb7c6 100644 (file)
--- a/openbox/ping.h
+++ b/openbox/ping.h
@@ -37,7 +37,6 @@ void ping_startup(gboolean reconfigure);
 void ping_shutdown(gboolean reconfigure);
 
 void ping_start(struct _ObClient *c, ObPingEventHandler h);
-void ping_stop(struct _ObClient *c);
 
 void ping_got_pong(guint32 id);