aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorThomas <thomas@xteddy.org>2014-02-05 10:47:57 +0000
committerThomas <thomas@xteddy.org>2014-02-05 10:47:57 +0000
commit6eef24c37a69c0faa12deb4374730cf02561c934 (patch)
tree181937aeab92a1a9aa3c888bb1194ba1f919ec2d /Makefile.am
parentd02c4bda3a4b456f654fb0c1b454ba9724bff0f3 (diff)
parent57332be8da86f0e40a91d7acd857564e789027a7 (diff)
downloadrtmux-6eef24c37a69c0faa12deb4374730cf02561c934.tar.gz
rtmux-6eef24c37a69c0faa12deb4374730cf02561c934.tar.bz2
rtmux-6eef24c37a69c0faa12deb4374730cf02561c934.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 690e466d..e5a7286e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -122,7 +122,6 @@ dist_tmux_SOURCES = \
cmd-select-pane.c \
cmd-select-window.c \
cmd-send-keys.c \
- cmd-server-info.c \
cmd-set-buffer.c \
cmd-set-environment.c \
cmd-set-option.c \
@@ -131,7 +130,6 @@ dist_tmux_SOURCES = \
cmd-show-options.c \
cmd-source-file.c \
cmd-split-window.c \
- cmd-start-server.c \
cmd-string.c \
cmd-suspend-client.c \
cmd-swap-pane.c \
@@ -175,6 +173,7 @@ dist_tmux_SOURCES = \
session.c \
signal.c \
status.c \
+ style.c \
tmux.c \
tty-acs.c \
tty-keys.c \