diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-16 07:53:32 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-16 07:53:32 +0200 |
| commit | 01102cdf33d68a7be192a139752831ff93dee117 (patch) | |
| tree | 84cc702a6d5bb77647f6df3840b41eb9a7b9faf4 /mesalib/src/glsl/glcpp/.gitignore | |
| parent | dcf9ae77854778629cabd0d6943dda3678eb91fa (diff) | |
| parent | d09d7be8bbbb39926f44834023d7120535155829 (diff) | |
| download | vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.tar.gz vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.tar.bz2 vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'mesalib/src/glsl/glcpp/.gitignore')
| -rw-r--r-- | mesalib/src/glsl/glcpp/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glcpp/.gitignore b/mesalib/src/glsl/glcpp/.gitignore index 9f7e0cc3e..c3f1f6e41 100644 --- a/mesalib/src/glsl/glcpp/.gitignore +++ b/mesalib/src/glsl/glcpp/.gitignore @@ -4,3 +4,4 @@ glcpp-parse.output glcpp-parse.c
glcpp-parse.h
tests/*.out
+/Makefile
|