diff options
| author | Christian König <[email protected]> | 2011-02-24 22:02:42 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-02-24 22:02:42 +0100 |
| commit | b922a0ce12916a91cfc3e56714913fcf63279ff2 (patch) | |
| tree | e24fa039925220882d155ccb987f7914e83f4372 /src/mapi/es2api/.gitignore | |
| parent | f013b4f8f1329982727691a55cc263e3011d02bf (diff) | |
| parent | c0ad70ae31ee5501281b434d56e389fc92b13a3a (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
configure.ac
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/drivers/r600/r600_asm.c
src/gallium/drivers/r600/r600_asm.h
src/gallium/drivers/r600/r600_shader.c
src/gallium/drivers/r600/r600_state_inlines.h
src/gallium/drivers/r600/r600_texture.c
Diffstat (limited to 'src/mapi/es2api/.gitignore')
| -rw-r--r-- | src/mapi/es2api/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mapi/es2api/.gitignore b/src/mapi/es2api/.gitignore index 7c9ca37247b..b21f1d14c6f 100644 --- a/src/mapi/es2api/.gitignore +++ b/src/mapi/es2api/.gitignore @@ -1,3 +1,4 @@ +glapi_mapi_tmp.h glapi-stamp glapi main |