diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-11 08:22:46 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-11 08:22:46 +0100 |
| commit | 0e1adc84d471955eaabe26486154e8ec44e91dd4 (patch) | |
| tree | e2363fb022bfa7b730b0032b4c35379aa2a997d6 /mesalib/src/glsl/glcpp | |
| parent | e59b1896b907c5ecfe184723d4c6adc2c20fa678 (diff) | |
| parent | ddc05759f098f06bd93253a7bffe38640963dfb3 (diff) | |
| download | vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.gz vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.bz2 vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
mesalib/src/mapi/glapi/gen/.gitignore
mesalib/src/mesa/program/.gitignore
Diffstat (limited to 'mesalib/src/glsl/glcpp')
| -rwxr-xr-x[-rw-r--r--] | mesalib/src/glsl/glcpp/.gitignore | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/src/glsl/glcpp/.gitignore b/mesalib/src/glsl/glcpp/.gitignore index c3f1f6e41..fc93edb36 100644..100755 --- a/mesalib/src/glsl/glcpp/.gitignore +++ b/mesalib/src/glsl/glcpp/.gitignore @@ -3,5 +3,3 @@ glcpp-lex.c glcpp-parse.output
glcpp-parse.c
glcpp-parse.h
-tests/*.out
-/Makefile
|