Merge branch 'obsd-master'

Conflicts:
	Makefile
	tmux.1
	window.c

1 files changed, 2 insertions, 1 deletions

diff --git a/environ.c b/environ.c
index 3c0a5cb2..f04afd15 100644
--- a/environ.c
+++ b/environ.c
@@ -137,7 +137,8 @@ environ_unset(struct environ *env, const char *name)
  * environment.
  */
 void
-environ_update(const char *vars, struct environ *srcenv, struct environ *dstenv)
+environ_update(const char *vars, struct environ *srcenv,
+    struct environ *dstenv)
 {
 	struct environ_entry	*envent;
 	char			*copyvars, *var, *next;