diff options
| author | Brian Paul <brianp@vmware.com> | 2009-12-31 09:02:27 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-12-31 09:02:27 -0700 |
| commit | 25024d948298a9f3f3210a0b91486f79a3917b0f (patch) | |
| tree | 5647623b9781193b7ed55c8d9233404938aeb853 /src/gallium/auxiliary/rbug/rbug_context.h | |
| parent | d14beea534dcb2b3ae2ae1f7ee0ba5dcdef3dba3 (diff) | |
| parent | 195e7657e2f15f7ad8b22042b86bcf33c5bba76b (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
configs/darwin
src/gallium/auxiliary/util/u_clear.h
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
Diffstat (limited to 'src/gallium/auxiliary/rbug/rbug_context.h')
| -rw-r--r-- | src/gallium/auxiliary/rbug/rbug_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/rbug/rbug_context.h b/src/gallium/auxiliary/rbug/rbug_context.h index da61c2365b..03126d6b12 100644 --- a/src/gallium/auxiliary/rbug/rbug_context.h +++ b/src/gallium/auxiliary/rbug/rbug_context.h @@ -46,7 +46,7 @@ typedef enum RBUG_BLOCK_BEFORE = 1, RBUG_BLOCK_AFTER = 2, RBUG_BLOCK_RULE = 4, - RBUG_BLOCK_MASK = 7, + RBUG_BLOCK_MASK = 7 } rbug_block_t; struct rbug_proto_context_list |