diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-05-16 18:36:35 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-05-16 18:36:35 +0100 |
| commit | bd87f6bf00946426bc1dd120eec35ca11aab99de (patch) | |
| tree | 6ce5a675cd10d64f61c99ad8d15d8739aa0ee66f | |
| parent | 57fe03dc5a132ee131de457afa5724ec735ae811 (diff) | |
| parent | 574a9e4b6c7a419b60668c30916327aa7e65d2c8 (diff) | |
| download | rtmux-bd87f6bf00946426bc1dd120eec35ca11aab99de.tar.gz rtmux-bd87f6bf00946426bc1dd120eec35ca11aab99de.tar.bz2 rtmux-bd87f6bf00946426bc1dd120eec35ca11aab99de.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | cmd-set-option.c | 1 | ||||
| -rw-r--r-- | options.c | 1 | ||||
| -rw-r--r-- | popup.c | 1 | ||||
| -rw-r--r-- | session.c | 1 | ||||
| -rw-r--r-- | window-customize.c | 2 |
5 files changed, 4 insertions, 2 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c index c6f83796..36579f29 100644 --- a/cmd-set-option.c +++ b/cmd-set-option.c @@ -18,7 +18,6 @@ #include <sys/types.h> -#include <fnmatch.h> #include <stdlib.h> #include <string.h> @@ -19,6 +19,7 @@ #include <sys/types.h> #include <ctype.h> +#include <fnmatch.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> @@ -19,6 +19,7 @@ #include <sys/types.h> #include <sys/wait.h> +#include <paths.h> #include <signal.h> #include <stdlib.h> #include <string.h> @@ -22,6 +22,7 @@ #include <string.h> #include <stdlib.h> #include <unistd.h> +#include <vis.h> #include <time.h> #include "tmux.h" diff --git a/window-customize.c b/window-customize.c index 5130357f..093ebbe4 100644 --- a/window-customize.c +++ b/window-customize.c @@ -1,7 +1,7 @@ /* $OpenBSD$ */ /* - * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com> + * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above |