Ignored revisions: 12346
Ignoring 3915 ancestors included in old builds.
included in: 219435
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16263">16263:f8ecc3530edd</a>
tag:         tip
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16261">16261:0ae4f68d0493</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16262">16262:60ba24c99863</a>
user:        Dave Parks <davep@lindenlab.com>
date:        Fri Jan 21 16:24:31 2011 -0600
summary:     merge

included in: 219435
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16262">16262:60ba24c99863</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16209">16209:0d015a310877</a>
user:        Dave Parks <davep@lindenlab.com>
date:        Fri Jan 21 16:23:44 2011 -0600
summary:     SH-534 Fix for various bump map glitches.

codeticket:  219425
included in: 219435
changeset:   <a href="http://hg.secondlife.com/mesh-development/changeset/16261">16261:0ae4f68d0493</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16257">16257:1cc76a8d54ed</a>
parent:      <a href="http://hg.secondlife.com/mesh-development/changeset/16260">16260:21f220e5c04b</a>
user:        Roxie Linden <roxie@lindenlab.com>
date:        Fri Jan 21 11:08:25 2011 -0800
summary:     automated merge

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