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

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	server.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-11-15 22:49:25 +00:00
parent bb820fa761 a582b62287
commit 8213558cc7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tmux.c
View File

@ -261,7 +261,7 @@ main(int argc, char **argv)
usage();
#ifdef __OpenBSD__
if (0 && pledge("stdio rpath wpath cpath flock fattr unix sendfd recvfd "
if (pledge("stdio rpath wpath cpath flock fattr unix sendfd recvfd "
"proc exec tty ps", NULL) != 0)
err(1, "pledge");
#endif