Skip to content
Commit 5d7c0ba5 authored by Mario Lang's avatar Mario Lang Committed by Mario Lang
Browse files

Merge commit 'upstream/4.2' 

Conflicts:
	Programs/brlapi_client.c
	Programs/config.c
	Programs/misc.c
	Programs/misc.h
	config.h.in
	configure
	configure.ac
parents 4cb11e2a 12927b0c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment