projects / platform / core / uifw / at-spi2-atk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab7d645 5eda624)
Merge branch 'master' of git+ssh://git.codethink.co.uk/git/atspi-dbus
authorMark Doffman <mdoff@silver-wind.(none)>
Fri, 25 Jul 2008 22:50:42 +0000 (23:50 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Fri, 25 Jul 2008 22:50:42 +0000 (23:50 +0100)
Conflicts:

configure.ac


Trivial merge
Domain: UI Framework / Assistive Technology;