There were conflicts several files, I chose to take the file from the repository since I had not made any changes. <br><br><div class="gmail_quote">On Tue, May 18, 2010 at 6:54 AM, Martin Poirier <span dir="ltr"><<a href="mailto:theeth@yahoo.com">theeth@yahoo.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><table cellspacing="0" cellpadding="0" border="0"><tbody><tr><td valign="top" style="font:inherit"><div class="im"><br>
<br>--- On <b>Tue, 5/18/10, Jason Wilkins <i><<a href="mailto:jason.a.wilkins@gmail.com" target="_blank">jason.a.wilkins@gmail.com</a>></i></b> wrote:<br><blockquote style="border-left:2px solid rgb(16, 16, 255);margin-left:5px;padding-left:5px">
<div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204, 204, 204);padding-left:1ex">
4) Have you successfully synched your branch with head?<br></blockquote><div><br></div><div>Yes, but there were some warnings. Not sure if I should be worried.<br><br></div></div></div></blockquote></div>What kind of warnings?<br>
<br>Martin<br><div><div class="gmail_quote"><div><br></div></div></div></td></tr></tbody></table><br><br>_______________________________________________<br>
Soc-2010-dev mailing list<br>
<a href="mailto:Soc-2010-dev@blender.org">Soc-2010-dev@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/soc-2010-dev" target="_blank">http://lists.blender.org/mailman/listinfo/soc-2010-dev</a><br>
<br></blockquote></div><br>