diff options
| author | Brian Paul <[email protected]> | 2009-02-10 16:44:02 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-02-10 16:44:02 -0700 |
| commit | 5340b6dff73a0a23531ce2a5f28fba8303adab6e (patch) | |
| tree | b141fc3648568dd8b941c966059e6ed32a8bd0ad /progs/demos/.gitignore | |
| parent | 9fd26daec24f21dbe17afcb2e2ab272667ee9a69 (diff) | |
| parent | ee4c921b65fb76998711f3c40330505cbc49a0e0 (diff) | |
Merge commit 'origin/gallium-master-merge'
This is the big merge of the gallium-0.2 branch into master.
gallium-master-merge was just the staging area for it.
Both gallium-0.2 and gallium-master-merge are considered closed now.
Conflicts:
progs/demos/Makefile
src/mesa/main/state.c
src/mesa/main/texenvprogram.c
Diffstat (limited to 'progs/demos/.gitignore')
| -rw-r--r-- | progs/demos/.gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/progs/demos/.gitignore b/progs/demos/.gitignore index ab836eb8340..d59d1752124 100644 --- a/progs/demos/.gitignore +++ b/progs/demos/.gitignore @@ -1,4 +1,3 @@ -.cvsignore arbfplight arbfslight arbocclude @@ -9,6 +8,7 @@ cubemap drawpix engine extfuncs.h +fbo_firecube fire fogcoord fplight @@ -54,6 +54,7 @@ texcyl texdown texenv texobj +textures trackball.c trackball.h trispd |