wee

2010-08-16 17:11:50 -04:00 · 2010-08-16 17:11:50 -04:00 · 362d72f0d3
commit 362d72f0d3
parent b65fc882ca
1 changed files with 0 additions and 1 deletions
--- a/powder.c
+++ b/powder.c
@ -3266,7 +3266,6 @@ justdraw:
 											blendpixel(vid, nx-tempx, ny-tempy, cr, cg, cb, 5);
 										}
 									}
->>>>>>> simon/master
                } else if(t==PT_PLSM)
                {
                    float ttemp = parts[i].life;