diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-06-12 12:09:34 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-06-12 12:09:34 -0400 |
| commit | 1036ef2bf468611d37b5df06fc4424f2002e3837 (patch) | |
| tree | f0859a6d903c2570a0a00c918da88139f8f7d065 /progs/demos/.gitignore | |
| parent | 917f8bc1a85e61311cef6478127b387df70fba14 (diff) | |
| parent | 1cd0afffc9edbcac690f8ab436aecfced26b0aba (diff) | |
Merge master and fix conflicts
Diffstat (limited to 'progs/demos/.gitignore')
| -rw-r--r-- | progs/demos/.gitignore | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/progs/demos/.gitignore b/progs/demos/.gitignore index d59d175212..f3c7091bcc 100644 --- a/progs/demos/.gitignore +++ b/progs/demos/.gitignore @@ -5,10 +5,12 @@ bounce clearspd copypix cubemap +dinoshade drawpix engine extfuncs.h fbo_firecube +fbotexture fire fogcoord fplight @@ -27,11 +29,9 @@ isosurf lodbias morph3d multiarb -occlude -osdemo paltex -pixeltex pointblast +projtex rain ray readpix @@ -61,4 +61,5 @@ trispd tunnel tunnel2 vao_demo +Windows winpos |