aboutsummaryrefslogtreecommitdiff
path: root/server-fn.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2014-04-23 11:26:11 +0100
committerThomas Adam <thomas@xteddy.org>2014-04-23 11:26:11 +0100
commit953c3ef47a1933d38308075c1bacc7ea8d38301b (patch)
tree6484bdd51ecedbb5888717db271c151257ec87f5 /server-fn.c
parent12e9c974fadc5ed6f0e7db10c40d5a0d55e0da8a (diff)
parent64613b9d411a7c76a50a2f9c66df345f082fce25 (diff)
downloadrtmux-953c3ef47a1933d38308075c1bacc7ea8d38301b.tar.gz
rtmux-953c3ef47a1933d38308075c1bacc7ea8d38301b.tar.bz2
rtmux-953c3ef47a1933d38308075c1bacc7ea8d38301b.zip
Merge branch 'obsd-master'
Conflicts: Makefile tmux.1 window.c
Diffstat (limited to 'server-fn.c')
-rw-r--r--server-fn.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/server-fn.c b/server-fn.c
index 30626984..e0859f70 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -291,7 +291,8 @@ server_kill_window(struct window *w)
int
server_link_window(struct session *src, struct winlink *srcwl,
- struct session *dst, int dstidx, int killflag, int selectflag, char **cause)
+ struct session *dst, int dstidx, int killflag, int selectflag,
+ char **cause)
{
struct winlink *dstwl;
struct session_group *srcsg, *dstsg;