Merge branch 'mgorse' of git+ssh://git.codethink.co.uk/git/atspi-dbus into rework
authorMark Doffman <mdoff@silver-wind.(none)>
Fri, 16 May 2008 16:36:23 +0000 (17:36 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Fri, 16 May 2008 16:36:23 +0000 (17:36 +0100)
commitf6ca06461319b20463f96a5b37544a540aee11ca
tree3f549e9044e1eaa61ef9c83e41203da05b7b3602
parentff143bfb6c3ca9e1a7362bd7f9c7c5eba31eb135
parent6d509d490749c6bac3149a5ec45862352ffcf290
Merge branch 'mgorse' of git+ssh://git.codethink.co.uk/git/atspi-dbus into rework

Conflicts:

Makefile.am
atk-adaptor/tree.c
configure.in
libspi/Makefile.am
libspi/accessible.h
libspi/introspectable.c
libspi/util.c
registryd/Makefile.am
registryd/desktop.c
registryd/deviceeventcontroller.c
registryd/deviceeventcontroller.h
registryd/registry.c
registryd/registry.h
spi-common/spi-dbus.c
xml/Accessibility_Registry.xml
xml/Makefile.am
atk-adaptor/introspectable.c
atk-adaptor/tree.c
registryd/deviceeventcontroller.c
registryd/registry.c
xml/Makefile.am