This website works better with JavaScript.
Home
Explore
Help
Sign In
brkho
/
mesa
Watch
1
Star
0
Fork
0
Code
Releases
562
Wiki
Activity
Browse Source
mesa: fix merge conflict left-overs
tags/mesa_20090313
Brian Paul
16 years ago
parent
ebcf06702c
commit
def84fac39
1 changed files
with
0 additions
and
1 deletions
Split View
Show Diff Stats
0
1
src/mesa/shader/prog_print.c
+ 0
- 1
src/mesa/shader/prog_print.c
View File
@@ -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)
{
Write
Preview
Loading…
Cancel
Save