Merge branch 'concurrent-cancellable'
authorStef Walter <stefw@collabora.co.uk>
Fri, 19 Aug 2011 09:21:11 +0000 (11:21 +0200)
committerStef Walter <stefw@collabora.co.uk>
Fri, 19 Aug 2011 09:21:11 +0000 (11:21 +0200)
commit26548e05bbb9bc2278fabeee07f6601f39d1a4dc
tree07f799075da180d4617081a9fa6514b46eb98687
parentf07b854a2b28dde75b3b0eb4746e674b2a220a42
parent54579bf88f2af4056fd19e539cc336bd17baea18
Merge branch 'concurrent-cancellable'
gio/tests/.gitignore
gio/tests/Makefile.am