aboutsummaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-04-21 16:01:18 +0100
committerThomas Adam <thomas@xteddy.org>2017-04-21 16:01:18 +0100
commit4612419c143c3f748bc5f6ccd467c7c0014e8d48 (patch)
tree42929aeeb8b1d89abf639124412199fac7092f04 /server.c
parent93062ad09952f411d48818b05dc9898bc14dcfde (diff)
parentc799425069d02675474cda312fac1457829052fb (diff)
downloadrtmux-4612419c143c3f748bc5f6ccd467c7c0014e8d48.tar.gz
rtmux-4612419c143c3f748bc5f6ccd467c7c0014e8d48.tar.bz2
rtmux-4612419c143c3f748bc5f6ccd467c7c0014e8d48.zip
Merge branch 'obsd-master'
Diffstat (limited to 'server.c')
-rw-r--r--server.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/server.c b/server.c
index 0d8179fe..20b86f8a 100644
--- a/server.c
+++ b/server.c
@@ -175,8 +175,6 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
start_cfg();
- status_prompt_load_history();
-
server_add_accept(0);
proc_loop(server_proc, server_loop);