Merge branch 'master' into remove-unnecessary-todo

8 years ago · 84ae6d02e8
parent baa17ec696 cef4a5cf70
commit 84ae6d02e8
1 changed files with 1 additions and 1 deletions
--- a/include/client/window.h
+++ b/include/client/window.h
@ -24,7 +24,7 @@ struct cursor {
 	struct wl_surface *surface;
 	struct wl_cursor_theme *cursor_theme;
 	struct wl_cursor *cursor;
-	struct wl_poitner *pointer;
+	struct wl_pointer *pointer;
 };

 enum scroll_direction {