Skip to content
Commit 446fda2f authored by Luke Yelavich's avatar Luke Yelavich
Browse files

Merge branch 'upstream' into upstream-dfsg 

Conflicts:
	tests/Makefile.in
	tests/apps/Makefile.in
	tests/data/Makefile.in
	tests/dummyatk/Makefile.in
	tests/pyatspi/Makefile.in
	tests/pyatspi/pasytest/Makefile.in
parents 76c576a3 8393015e
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