Merge branch 'enum-types'
authorMike Gorse <mgorse@suse.com>
Fri, 10 May 2013 23:56:32 +0000 (18:56 -0500)
committerMike Gorse <mgorse@suse.com>
Fri, 10 May 2013 23:56:32 +0000 (18:56 -0500)
Conflicts:
atspi/Makefile.am
atspi/atspi-accessible.c


No differences found