summaryrefslogtreecommitdiffstats
path: root/src/angle/src
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2013-12-23 22:44:13 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-23 22:44:13 +0100
commitd776937df91e46536f404c6868d64016b6038d7b (patch)
treedde5a5ab39d27a5b0bc3327127c7d6dd1b1ae5f8 /src/angle/src
parente14503d353de7246a1d6e36894dd77bb32c4af3b (diff)
parent3f3be55835427ea9f1bbcc046e05ee538ca214d7 (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/angle/src')
-rw-r--r--src/angle/src/.gitignore6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/angle/src/.gitignore b/src/angle/src/.gitignore
new file mode 100644
index 0000000000..9cbadb59ef
--- /dev/null
+++ b/src/angle/src/.gitignore
@@ -0,0 +1,6 @@
+/libGLESv2/renderer/
+/compiler/glslang_lex.cpp
+/compiler/glslang_tab.cpp
+/compiler/glslang_tab.h
+/compiler/preprocessor/ExpressionParser.cpp
+/compiler/preprocessor/Tokenizer.cpp