projects / platform / core / uifw / at-spi2-atk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72cb9b8 540b46a)
Merge ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
authorMike Gorse <mgorse@boston.site>
Mon, 16 Jun 2008 15:35:05 +0000 (11:35 -0400)
committerMike Gorse <mgorse@boston.site>
Mon, 16 Jun 2008 15:35:05 +0000 (11:35 -0400)
Conflicts:

atk-adaptor/bridge.c

1  2 
atk-adaptor/bridge.c patch | diff1 | diff2 | blob | history

diff --cc atk-adaptor/bridge.c
Simple merge
Domain: UI Framework / Assistive Technology;