Merge branch 'obsd-master'

2025-09-05 16:27:03 +00:00 · 2016-09-28 10:01:11 +01:00
parent 30f2e8ff29 acacb718e5
commit 27591570c4
3 changed files with 41 additions and 4 deletions
--- a/tmux.h
+++ b/tmux.h
@ -896,6 +896,8 @@ struct window_pane {
 	int		 fd;
 	struct bufferevent *event;

+	struct event	 resize_timer;
+
 	u_int		 wmark_size;
 	u_int		 wmark_hits;