[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.16-3-1415-g3bdb156

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit df6a40b113a7593f058d684798911a265a5f8070
Author: Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Date:   Wed Dec 2 22:42:37 2009 -0200

    Fixing bad conflict resolution

diff --git a/WebKit/gtk/webkit/webkitwebinspector.h b/WebKit/gtk/webkit/webkitwebinspector.h
index 2b75de2..bde4854 100644
--- a/WebKit/gtk/webkit/webkitwebinspector.h
+++ b/WebKit/gtk/webkit/webkitwebinspector.h
@@ -63,6 +63,7 @@ webkit_web_inspector_get_inspected_uri(WebKitWebInspector* web_inspector);
 WEBKIT_API void
 webkit_web_inspector_inspect_coordinates(WebKitWebInspector* web_inspector, gdouble x, gdouble y);
 
+WEBKIT_API void
 webkit_web_inspector_show(WebKitWebInspector* webInspector);
 
 WEBKIT_API void

-- 
WebKit Debian packaging