Conflicts:

Makefile
This commit is contained in:
Thomas Adam
2015-12-08 07:11:09 +00:00
12 changed files with 366 additions and 19 deletions

3
tmux.c
View File

@ -40,6 +40,7 @@ struct options *global_options; /* server options */
struct options *global_s_options; /* session options */
struct options *global_w_options; /* window options */
struct environ *global_environ;
struct hooks *global_hooks;
struct timeval start_time;
const char *socket_path;
@ -284,6 +285,8 @@ main(int argc, char **argv)
flags |= CLIENT_UTF8;
}
global_hooks = hooks_create(NULL);
global_environ = environ_create();
for (var = environ; *var != NULL; var++)
environ_put(global_environ, *var);