circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 17:46:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	cfg.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-09-06 20:47:50 +01:00
parent 2ebef95994 aceae73b9a
commit 76688d2040
17 changed files with 346 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tty-term.c
View File

@@ -566,7 +566,6 @@ tty_term_string(struct tty_term *term, enum tty_code_code code)
return (term->codes[code].value.string);
}
/* No vtparm. Fucking curses. */
const char *
tty_term_string1(struct tty_term *term, enum tty_code_code code, int a)
{