diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-08-18 12:20:36 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-08-18 12:20:36 -0700 |
| commit | a512985fd81c1ed4ccc5e69aaa05015cf7ff844d (patch) | |
| tree | 69e6e898deaeaed2b4dfb5851707c68261c464de /src/mesa/drivers/dri/r300/.gitignore | |
| parent | 0b5af41c6fae2809f4567a7cecbd207e5e4f3ab5 (diff) | |
| parent | c80bc3abcd3939e5e2d45aea4b01ff22bfec244b (diff) | |
Merge branch 'master' into asm-shader-rework-1
Conflicts:
src/mesa/shader/arbprogparse.c
Diffstat (limited to 'src/mesa/drivers/dri/r300/.gitignore')
| -rw-r--r-- | src/mesa/drivers/dri/r300/.gitignore | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/mesa/drivers/dri/r300/.gitignore b/src/mesa/drivers/dri/r300/.gitignore deleted file mode 100644 index 2f9cd1a987..0000000000 --- a/src/mesa/drivers/dri/r300/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -radeon_bocs_wrapper.h -radeon_bo_legacy.[ch] -radeon_chipset.h -radeon_cmdbuf.h -radeon_common.[ch] -radeon_common_context.[ch] -radeon_cs_legacy.[ch] -radeon_dma.[ch] -radeon_fbo.c -radeon_lock.[ch] -radeon_mipmap_tree.[ch] -radeon_screen.[ch] -radeon_span.[ch] -radeon_texture.[ch] -server |