summaryrefslogtreecommitdiff
path: root/dist/Mesa/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2014-07-09 21:09:02 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2014-07-09 21:09:02 +0000
commit473dc96b5bfcd9b8163bba1931980c767d4e8a86 (patch)
tree792db8214c0e02c8c286cc22b67ad99ff928095f /dist/Mesa/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
parent90414e9e8766ee4a4f0ba93d8206de27cf984ce6 (diff)
Merge Mesa 10.2.3
tested by matthieu@ kettenis@ mpi@ brett@ and myself across a diverse range of hardware
Diffstat (limited to 'dist/Mesa/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected')
-rw-r--r--dist/Mesa/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected2
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/Mesa/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected b/dist/Mesa/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
index 84fdc50c9..be20b7c89 100644
--- a/dist/Mesa/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
+++ b/dist/Mesa/src/glsl/glcpp/tests/094-divide-by-zero-short-circuit.c.expected
@@ -1,4 +1,5 @@
0:12(17): preprocessor error: division by 0 in preprocessor directive
+
@@ -9,7 +10,6 @@
-