diff options
author | Thomas Adam <thomas@xteddy.org> | 2015-11-13 10:42:45 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2015-11-13 10:42:45 +0000 |
commit | 3df4959f51a444a83e92894c390182dd48e02025 (patch) | |
tree | 31591c7d439c6d3841e1610e4c2cf70d5f5d115c /Makefile.am | |
parent | a7027ed8e5d8fd314c1fafaf0c809b575a753a09 (diff) | |
parent | c5689a5a4031a43769b8b721cafa6d1eab6abc44 (diff) |
Merge branch 'obsd-master'
Conflicts:
Makefile
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 9cf3bc87..02784c4a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,7 +136,6 @@ dist_tmux_SOURCES = \ control-notify.c \ environ.c \ format.c \ - grid-cell.c \ grid-view.c \ grid.c \ input-keys.c \ |