circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 21:56:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	tmux.1
	window.c
This commit is contained in:
Thomas Adam
2014-04-23 11:26:11 +01:00
parent 12e9c974fa 64613b9d41
commit 953c3ef47a
49 changed files with 431 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server-fn.c
View File

@ -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;