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)
commite74c40ea4b7616930557ca2e9eda73f5b344a4b5
tree85d65785426bede318aa66e7804f4a6fcb24d30d
parenta29788df335d9ffc2fd471463ba996ba1aca4665
parent7afb51e5093fef46c699d92ee8eee94f5b6886fb
Merge branch 'enum-types'

Conflicts:
atspi/Makefile.am
atspi/atspi-accessible.c
atspi/Makefile.am
atspi/atspi-accessible.c
atspi/atspi-accessible.h
atspi/atspi-constants.h
atspi/atspi-misc-private.h
atspi/atspi-misc.c
atspi/atspi-registry.c
atspi/atspi-registry.h
atspi/atspi-stateset.c
atspi/atspi-types.h
configure.ac