projects / platform / upstream / at-spi2-atk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44b8c01 02fbca3)
Merge branch 'master' of git+ssh://doffm@git.freedesktop.org/git/at-spi2/at-spi2...
authorMark Doffman <mdoff@silver-wind.(none)>
Tue, 21 Apr 2009 16:22:42 +0000 (17:22 +0100)
committerMark Doffman <mdoff@silver-wind.(none)>
Tue, 21 Apr 2009 16:22:42 +0000 (17:22 +0100)
Conflicts:

pyatspi/base.py
spi-common/spi-dbus.h


Trivial merge
Domain: UI Framework / Assistive Technology;