diff options
| author |  Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-05-13 11:45:11 +1000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-13 11:45:11 +1000 |
| commit | 90e6dfa268461a10d6b95c3a7d74834923392cd6 (patch) | |
| tree | 34ca494ccdc42799010a00f495b1d19193f20fe7 /include | |
| parent | Fix recursion when counting descendants of a type (diff) | |
| parent | Merge pull request #1967 from emersion/remove-xdg-popup-unmap (diff) | |
| download | sway-90e6dfa268461a10d6b95c3a7d74834923392cd6.tar.gz sway-90e6dfa268461a10d6b95c3a7d74834923392cd6.tar.zst sway-90e6dfa268461a10d6b95c3a7d74834923392cd6.zip | |
Merge branch 'master' into edge-borders
Diffstat (limited to 'include')
| -rw-r--r-- | include/sway/tree/view.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 4ecd8c44..8091fe0c 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h | |||
| @@ -153,7 +153,6 @@ struct sway_xdg_popup_v6 { | |||
| 153 | struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; | 153 | struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6; |
| 154 | 154 | ||
| 155 | struct wl_listener new_popup; | 155 | struct wl_listener new_popup; |
| 156 | struct wl_listener unmap; | ||
| 157 | struct wl_listener destroy; | 156 | struct wl_listener destroy; |
| 158 | }; | 157 | }; |
| 159 | 158 | ||