diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2017-03-18 17:30:00 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-18 17:30:00 -0400 |
| commit | 84ae6d02e8bc6e11fd66cf7521a8cf1dac2df93b (patch) | |
| tree | 1f2b0fb30f3e49ec0053d493e3e218f3f866ca29 | |
| parent | remove unnecessary todo item (diff) | |
| parent | Merge pull request #1124 from zandrmartin/correct-typo (diff) | |
| download | sway-84ae6d02e8bc6e11fd66cf7521a8cf1dac2df93b.tar.gz sway-84ae6d02e8bc6e11fd66cf7521a8cf1dac2df93b.tar.zst sway-84ae6d02e8bc6e11fd66cf7521a8cf1dac2df93b.zip | |
Merge branch 'master' into remove-unnecessary-todo
| -rw-r--r-- | include/client/window.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/client/window.h b/include/client/window.h index fbfbbc5f..8af8225c 100644 --- a/include/client/window.h +++ b/include/client/window.h | |||
| @@ -24,7 +24,7 @@ struct cursor { | |||
| 24 | struct wl_surface *surface; | 24 | struct wl_surface *surface; |
| 25 | struct wl_cursor_theme *cursor_theme; | 25 | struct wl_cursor_theme *cursor_theme; |
| 26 | struct wl_cursor *cursor; | 26 | struct wl_cursor *cursor; |
| 27 | struct wl_poitner *pointer; | 27 | struct wl_pointer *pointer; |
| 28 | }; | 28 | }; |
| 29 | 29 | ||
| 30 | enum scroll_direction { | 30 | enum scroll_direction { |