The branch, master has been updated
via 18989cd430d9c23e2bdc4455213421a8ee104d2c (commit)
via 828145456c4c1ab8340c2a38ee7e66333cff1d27 (commit)
from 097a046e4a2e4e637a53cfc85efca1c4268242c2 (commit)
- Log -----------------------------------------------------------------
commit 18989cd430d9c23e2bdc4455213421a8ee104d2c
Merge: 8281454 097a046
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Makefile.am | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
commit 828145456c4c1ab8340c2a38ee7e66333cff1d27
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Don't set TMUX_CONF in tmux.h.
---
tmux.h | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/tmux.h b/tmux.h
index 1231036..cd40d4e 100644
--- a/tmux.h
+++ b/tmux.h
@@ -39,9 +39,6 @@
extern char *__progname;
extern char **environ;
-/* Default global configuration file. */
-#define TMUX_CONF "/etc/tmux.conf"
-
/* Default prompt history length. */
#define PROMPT_HISTORY 100
-----------------------------------------------------------------------
Summary of changes:
tmux.h | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
