mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
Conflicts: Makefile grid-utf8.c
This commit is contained in:
		@@ -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 \
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user