circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	tmux.1
This commit is contained in:
Thomas Adam
2015-04-27 21:21:55 +01:00
parent 72e9ebf2ec 95195f5258
commit 94a8ef1cae
18 changed files with 1330 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@@ -80,6 +80,7 @@ dist_tmux_SOURCES = \
cmd-detach-client.c \
cmd-display-message.c \
cmd-display-panes.c \
cmd-find.c \
cmd-find-window.c \
cmd-if-shell.c \
cmd-join-pane.c \