projects / platform / upstream / at-spi2-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 58562c8 c1df8f3)
Merge branch 'master' of git+ssh://doffm@git.freedesktop.org/git/at-spi2/at-spi2...
authorMark Doffman <mdoff@silver-wind.(none)>
Tue, 3 Mar 2009 16:05:13 +0000 (16:05 +0000)
committerMark Doffman <mdoff@silver-wind.(none)>
Tue, 3 Mar 2009 16:05:13 +0000 (16:05 +0000)
commitbe85f6679837d731b2008cb3b0c485c03b661cad
tree781c1747ed6ff5d19d4889484757f0c4772734d7tree | snapshot
parent58562c8ca09377c5ba44bd3ba2b49c72e8d84f5bcommit | diff
parentc1df8f36f6577f0b847e83f092719e02f93736f2commit | diff
Merge branch 'master' of git+ssh://doffm@git.freedesktop.org/git/at-spi2/at-spi2-core

Conflicts:

registryd/deviceeventcontroller.c
registryd/deviceeventcontroller.c diff1 | diff2 | blob | history
Domain: UI Framework / Assistive Technology;