diff options
author | Mike Gorse <mgorse@suse.com> | 2013-05-10 18:56:32 -0500 |
---|---|---|
committer | Mike Gorse <mgorse@suse.com> | 2013-05-10 18:56:32 -0500 |
commit | e74c40ea4b7616930557ca2e9eda73f5b344a4b5 (patch) | |
tree | 85d65785426bede318aa66e7804f4a6fcb24d30d /atspi/atspi-constants.h | |
parent | a29788df335d9ffc2fd471463ba996ba1aca4665 (diff) | |
parent | 7afb51e5093fef46c699d92ee8eee94f5b6886fb (diff) | |
download | at-spi2-core-e74c40ea4b7616930557ca2e9eda73f5b344a4b5.tar.gz |
Merge branch 'enum-types'
Conflicts:
atspi/Makefile.am
atspi/atspi-accessible.c
Diffstat (limited to 'atspi/atspi-constants.h')
-rw-r--r-- | atspi/atspi-constants.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/atspi/atspi-constants.h b/atspi/atspi-constants.h index 98564e0c..fe734382 100644 --- a/atspi/atspi-constants.h +++ b/atspi/atspi-constants.h @@ -1192,8 +1192,8 @@ typedef enum { typedef enum { - ATSPI_CACHE_NONE = 0, - ATSPI_CACHE_PARENT = 1 << 0, + ATSPI_CACHE_NONE = 0, + ATSPI_CACHE_PARENT = 1 << 0, ATSPI_CACHE_CHILDREN = 1 << 1, ATSPI_CACHE_NAME = 1 << 2, ATSPI_CACHE_DESCRIPTION = 1 << 3, |