Ignored revisions: 12346
Ignoring 4162 ancestors included in old builds.
included in: 220953
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16511">16511:877c61a92549</a>
tag:         tip
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16508">16508:e9661bfc64c4</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16510">16510:ec4ad7e3ecca</a>
user:        Loren Shih <seraph@lindenlab.com>
date:        Fri Feb 11 10:30:01 2011 -0500
summary:     Automated merge up from viewer-development into mesh-development

codeticket:  220842
included in: 220953
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16510">16510:ec4ad7e3ecca</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16494">16494:e3f87f72e083</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16509">16509:7a1440277911</a>
user:        Merov Linden <merov@lindenlab.com>
date:        Thu Feb 10 11:56:06 2011 -0800
summary:     STORM-986 : Fix for Linux build

included in: 220842
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16509">16509:7a1440277911</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16493">16493:722eda82ef7d</a>
user:        callum
date:        Thu Feb 10 11:51:53 2011 -0800
summary:     STORM-986 FIX (build error/Linux) media_plugin_webkit errors on some Windows systems

codeticket:  220903
included in: 220953
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16508">16508:e9661bfc64c4</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16507">16507:9273cd29e34b</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16504">16504:86318d8bb84e</a>
user:        leyla_linden
date:        Thu Feb 10 17:30:38 2011 -0800
summary:     Merge

</pre></body></html>