circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-02 13:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	format.c
This commit is contained in:
Thomas Adam
2015-08-30 21:44:01 +01:00
parent 486421ceff b87dc608d9
commit cb89f2f2a1
26 changed files with 594 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -57,6 +57,7 @@ endif
# List of sources.
dist_tmux_SOURCES = \
alerts.c \
arguments.c \
attributes.c \
cfg.c \
@ -156,7 +157,6 @@ dist_tmux_SOURCES = \
screen.c \
server-client.c \
server-fn.c \
server-window.c \
server.c \
session.c \
signal.c \