Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code

Conflicts:
	Makefile.am

1 files changed, 1 insertions, 1 deletions

diff --git a/tmux.c b/tmux.c
index 2916bbb5..606c574f 100644
--- a/tmux.c
+++ b/tmux.c
@@ -363,7 +363,7 @@ main(int argc, char **argv)
 			if (pw != NULL)
 				home = pw->pw_dir;
 		}
-		xasprintf(&cfg_file, "%s/%s", home, DEFAULT_CFG);
+		xasprintf(&cfg_file, "%s/.tmux.conf", home);
 		if (access(cfg_file, R_OK) != 0 && errno == ENOENT) {
 			free(cfg_file);
 			cfg_file = NULL;