diff options
| author | Brian Paul <brianp@vmware.com> | 2009-01-06 08:48:27 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-01-06 08:48:27 -0700 |
| commit | def84fac39fe356f34d8803989b554f15dac5909 (patch) | |
| tree | 5bbe96c0c845b7542596317241adb3f0b5be7089 /src/mesa/shader | |
| parent | ebcf06702c22419221c136a438c934469c2422cc (diff) | |
mesa: fix merge conflict left-overs
Diffstat (limited to 'src/mesa/shader')
| -rw-r--r-- | src/mesa/shader/prog_print.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c index 8a50fe76fe..db6eac4fd9 100644 --- a/src/mesa/shader/prog_print.c +++ b/src/mesa/shader/prog_print.c @@ -358,7 +358,6 @@ _mesa_swizzle_string(GLuint swizzle, GLuint negateBase, GLboolean extended) } -<<<<<<< HEAD:src/mesa/shader/prog_print.c void _mesa_print_swizzle(GLuint swizzle) { |