projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ebcf067
)
mesa: fix merge conflict left-overs
author
Brian Paul
<brianp@vmware.com>
Tue, 6 Jan 2009 15:48:27 +0000
(08:48 -0700)
committer
Brian Paul
<brianp@vmware.com>
Tue, 6 Jan 2009 15:48:27 +0000
(08:48 -0700)
src/mesa/shader/prog_print.c
patch
|
blob
|
history
diff --git
a/src/mesa/shader/prog_print.c
b/src/mesa/shader/prog_print.c
index
8a50fe7
..
db6eac4
100644
(file)
--- 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)
{