From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 16 May 2008 21:17:35 +0000 (-0600)
Subject: fix merge collision
X-Git-Tag: 062012170305~18656
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f27c6f313955b737888ce80752ee9cd895562d40;p=profile%2Fivi%2Fmesa.git

fix merge collision
---

diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c
index 4432893..46446d4 100644
--- a/src/mesa/tnl/t_vp_build.c
+++ b/src/mesa/tnl/t_vp_build.c
@@ -1572,11 +1572,9 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx )
 	 cache_item(ctx, tnl->vp_cache, hash, key, newProg);
 
          _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, newProg);
-      } else {
-	 FREE(key);
       }
       else {
-         FREE(key);
+	 FREE(key);
       }
 
       _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, newProg);