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/.gitignore | |
| 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/.gitignore')
| -rw-r--r-- | mesalib/.gitignore | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/.gitignore b/mesalib/.gitignore index 8f39b5334..faf2ca383 100644 --- a/mesalib/.gitignore +++ b/mesalib/.gitignore @@ -4,6 +4,7 @@ *.ilk *.la *.lo +*.log *.o *.obj *.os @@ -17,6 +18,7 @@ *.tar *.tar.bz2 *.tar.gz +*.trs *.zip *~ depend @@ -36,9 +38,9 @@ config.py build libtool manifest.txt -Makefile.in .dir-locals.el .deps/ .dirstamp .libs/ -/Makefile +Makefile +Makefile.in |