Skip to content
Commit cc2cbebb authored by Mario Lang's avatar Mario Lang
Browse files

Merge commit 'upstream/4.1' 

Conflicts:
	Bindings/Lisp/brlapi.lisp
	Bindings/Python/brlapi.pyx
	Programs/brltty.c
parents 0f44204f cb3fa58f
Expand all 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