diff options
| author | Ian Romanick <[email protected]> | 2010-08-16 19:08:53 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2010-08-16 19:08:53 -0700 |
| commit | 6c03c576cc49bbb008de66d374f4302ff0fe0390 (patch) | |
| tree | 7ddeb3ee88532d9aef8728b9aa256edf7c125247 /src/glsl/glcpp/tests/040-token-pasting.c.expected | |
| parent | 15a3b42e135a3a2cb463ec3cff80a55dd8528051 (diff) | |
| parent | a433cd286c60eb9d4c2114f042709eda0f3de676 (diff) | |
Merge branch 'glsl2'
Conflicts:
src/mesa/program/prog_optimize.c
Diffstat (limited to 'src/glsl/glcpp/tests/040-token-pasting.c.expected')
| -rw-r--r-- | src/glsl/glcpp/tests/040-token-pasting.c.expected | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/glsl/glcpp/tests/040-token-pasting.c.expected b/src/glsl/glcpp/tests/040-token-pasting.c.expected new file mode 100644 index 00000000000..36f66992539 --- /dev/null +++ b/src/glsl/glcpp/tests/040-token-pasting.c.expected @@ -0,0 +1,3 @@ + +onetoken + |