diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-08-30 21:44:01 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-08-30 21:44:01 +0100 |
| commit | cb89f2f2a197db5bf7e1acc8248f381c6f0410cd (patch) | |
| tree | 9074f8aa373b1bcb857fee46a47d305152cacf06 /Makefile.am | |
| parent | 486421ceff1b4d618d84ac3cb8c4dd9135b7960d (diff) | |
| parent | b87dc608d9b5b470926aaf77c5956befdfb7bc7b (diff) | |
| download | rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.tar.gz rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.tar.bz2 rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
format.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 3173ba99..e9a6bd33 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ |