diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-04-21 09:25:07 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-04-21 09:25:07 +0100 |
| commit | 22e594fcea0c3e73660780665296e2d5d71bd745 (patch) | |
| tree | 6da2d795aaa489c045da9075e7ba2f1d17383f71 /Makefile.am | |
| parent | 02580ac134522437bcfe8a68138787d444171d19 (diff) | |
| parent | 87997efe8d4d6aeca561107f5449818184687240 (diff) | |
Merge branch 'obsd-master'
Conflicts:
Makefile.am
pty.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index e0eb143c..7c356c06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -151,7 +151,7 @@ dist_tmux_SOURCES = \ options.c \ paste.c \ proc.c \ - pty.c \ + procname.c \ resize.c \ screen-redraw.c \ screen-write.c \ |