diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-10 16:44:02 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-10 16:44:02 -0700 |
| commit | 5340b6dff73a0a23531ce2a5f28fba8303adab6e (patch) | |
| tree | b141fc3648568dd8b941c966059e6ed32a8bd0ad /.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 '.gitignore')
| -rw-r--r-- | .gitignore | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index f5a0abcfe4..1c3d44665e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,15 @@ *.a +*.dll +*.exe +*.ilk *.o +*.obj +*.pc +*.pdb +*.pyc +*.pyo *.so *.sw[a-z] -*.pc *~ depend depend.bak @@ -14,3 +21,6 @@ aclocal.m4 config.log config.status cscope* +.scon* +config.py +build |