Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / doxygen / .gitignore

diff --git a/doxygen/.gitignore b/doxygen/.gitignore
index 253aabac19254dc4c5c4b75afce8514b2fd86100..62a37224ddcea78541398e1c7775e070cc8943d4 100644 (file)
--- a/doxygen/.gitignore
+++ b/doxygen/.gitignore
@@ -6,6 +6,7 @@ core
 core_subset
 gallium
 glapi
+glsl
 main
 math
 math_subset