Skip to content
Commit 9acdb500 authored by Callum Lowcay's avatar Callum Lowcay
Browse files

Merge branch 'master' of git://anongit.freedesktop.org/wayland 

Conflicts:
	clients/terminal.c
parents 67a201da 08c40c35
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