diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-11 09:01:24 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-11 09:01:24 +0200 |
| commit | a660c10f0f261b390ada5c3a5d0543088830f070 (patch) | |
| tree | 522977aa2a1be8687b1399e8afa2503daa58821b /mesalib/src/glsl/glcpp | |
| parent | 72ec0e3bb2d7fc6b77b2a75873792f781679da6a (diff) | |
| parent | 080d1527a5358dd66ac927acbe0ec61cba7aa7e1 (diff) | |
| download | vcxsrv-a660c10f0f261b390ada5c3a5d0543088830f070.tar.gz vcxsrv-a660c10f0f261b390ada5c3a5d0543088830f070.tar.bz2 vcxsrv-a660c10f0f261b390ada5c3a5d0543088830f070.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'mesalib/src/glsl/glcpp')
| -rw-r--r-- | mesalib/src/glsl/glcpp/.gitignore | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mesalib/src/glsl/glcpp/.gitignore b/mesalib/src/glsl/glcpp/.gitignore index af1f899e9..9f7e0cc3e 100644 --- a/mesalib/src/glsl/glcpp/.gitignore +++ b/mesalib/src/glsl/glcpp/.gitignore @@ -3,7 +3,4 @@ glcpp-lex.c glcpp-parse.output
glcpp-parse.c
glcpp-parse.h
-*.o
-*.lo
-*~
tests/*.out
|