Merge branch 'master' into remove-unnecessary-todo

This commit is contained in:
Drew DeVault 2017-03-18 17:30:00 -04:00 committed by GitHub
commit 84ae6d02e8

View File

@ -24,7 +24,7 @@ struct cursor {
struct wl_surface *surface; struct wl_surface *surface;
struct wl_cursor_theme *cursor_theme; struct wl_cursor_theme *cursor_theme;
struct wl_cursor *cursor; struct wl_cursor *cursor;
struct wl_poitner *pointer; struct wl_pointer *pointer;
}; };
enum scroll_direction { enum scroll_direction {