circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-12-25 10:26:05 +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
environ.c
View File

@@ -137,7 +137,8 @@ environ_unset(struct environ *env, const char *name)
* environment.
*/
void
environ_update(const char *vars, struct environ *srcenv, struct environ *dstenv)
environ_update(const char *vars, struct environ *srcenv,
struct environ *dstenv)
{
struct environ_entry *envent;
char *copyvars, *var, *next;