diff options
| author | Thomas Adam <thomas.adam@smoothwall.net> | 2013-01-30 15:27:19 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas.adam@smoothwall.net> | 2013-01-30 15:27:19 +0000 |
| commit | a3f4eb7b24ee98b4a499ca52c29ec2e29f33aa76 (patch) | |
| tree | fc72465468b26b578f9546eede2a3f7334442928 /Makefile.am | |
| parent | 2ca8b7f3593ec5a88c9f56a43f5076800957a0db (diff) | |
| parent | fdbfc7e3498e1cdd04e8df58aa1a937ee4d79caa (diff) | |
| download | rtmux-a3f4eb7b24ee98b4a499ca52c29ec2e29f33aa76.tar.gz rtmux-a3f4eb7b24ee98b4a499ca52c29ec2e29f33aa76.tar.bz2 rtmux-a3f4eb7b24ee98b4a499ca52c29ec2e29f33aa76.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
grid-utf8.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 672208bc..0bdfb8d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -139,7 +139,7 @@ dist_tmux_SOURCES = \ control-notify.c \ environ.c \ format.c \ - grid-utf8.c \ + grid-cell.c \ grid-view.c \ grid.c \ input-keys.c \ |