projects / platform / core / uifw / at-spi2-atk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Conflicts:

registryd/deviceeventcontroller.c

1  2 
registryd/deviceeventcontroller.c patch | diff1 | diff2 | blob | history

diff --cc registryd/deviceeventcontroller.c
Simple merge
Domain: UI Framework / Assistive Technology;