Merge branch 'obsd-master'

Conflicts:
	Makefile
	cmd-list-commands.c
	cmd-suspend-client.c
	job.c
	tmux.h
	xmalloc.c
This commit is contained in:
Thomas Adam
2014-10-21 07:11:44 +01:00
100 changed files with 432 additions and 757 deletions

View File

@ -35,7 +35,6 @@ const struct cmd_entry cmd_show_messages_entry = {
"IJTt:", 0, 0,
"[-IJT] " CMD_TARGET_CLIENT_USAGE,
0,
NULL,
cmd_show_messages_exec
};
@ -44,7 +43,6 @@ const struct cmd_entry cmd_server_info_entry = {
"", 0, 0,
"",
0,
NULL,
cmd_show_messages_exec
};