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/mesa/drivers | |
| 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/mesa/drivers')
| -rw-r--r-- | mesalib/src/mesa/drivers/.gitignore | 1 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/.gitignore | 1 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/swrast/.gitignore | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/mesalib/src/mesa/drivers/.gitignore b/mesalib/src/mesa/drivers/.gitignore deleted file mode 100644 index 5fc607b9e..000000000 --- a/mesalib/src/mesa/drivers/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Makefile diff --git a/mesalib/src/mesa/drivers/dri/.gitignore b/mesalib/src/mesa/drivers/dri/.gitignore deleted file mode 100644 index f3c7a7c5d..000000000 --- a/mesalib/src/mesa/drivers/dri/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile diff --git a/mesalib/src/mesa/drivers/dri/swrast/.gitignore b/mesalib/src/mesa/drivers/dri/swrast/.gitignore deleted file mode 100644 index f3c7a7c5d..000000000 --- a/mesalib/src/mesa/drivers/dri/swrast/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile |