mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
Conflicts: Makefile tmux.c
This commit is contained in:
		@@ -165,6 +165,7 @@ dist_tmux_SOURCES = \
 | 
			
		||||
	options.c \
 | 
			
		||||
	paste.c \
 | 
			
		||||
	proc.c \
 | 
			
		||||
	pty.c \
 | 
			
		||||
	resize.c \
 | 
			
		||||
	screen-redraw.c \
 | 
			
		||||
	screen-write.c \
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user