Merge branch 'je/hooks'

diff --git a/usage.c b/usage.c
index 4dc5c77633747e0c2b3a4d04fddbd043f8f49e1e..f5e652cc76d7587fd7b682eb865d3436c99b16fb 100644 (file)
--- a/usage.c
+++ b/usage.c
@@ -86,7 +86,7 @@ int error(const char *err, ...)
        return -1;
 }
 
-void warn(const char *warn, ...)
+void warning(const char *warn, ...)
 {
        va_list params;