Merge branch 'master' into next

[i3/i3] / i3-input / i3-input.h

diff --git a/i3-input/i3-input.h b/i3-input/i3-input.h
index d97807d1749decec42982bf935e50fb37d6028f3..f494cbd56704c260c4806e486a17fd301948c4b8 100644 (file)
--- a/i3-input/i3-input.h
+++ b/i3-input/i3-input.h
@@ -14,7 +14,4 @@ while (0)
 
 extern xcb_window_t root;
 
-char *convert_ucs_to_utf8(char *input);
-char *convert_utf8_to_ucs2(char *input, int *real_strlen);
-
 #endif