Skip to content
Commit fdd61983 authored by Samuel Thibault's avatar Samuel Thibault
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 eed9437b e575fb37
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