Ignored revisions: 12346
Ignoring 2309 ancestors included in old builds.
included in: 219999
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14657">14657:691e3941d950</a>
tag:         tip
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14655">14655:fe7fe04ccc9a</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14656">14656:57e9ad7b408c</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Sat Jan 29 15:35:54 2011 -0500
summary:     Automated merge with file:///Users/oz/Work/V-D

codeticket:  219998
included in: 219999
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14656">14656:57e9ad7b408c</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14649">14649:45a63ad4d737</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Sat Jan 29 13:09:55 2011 -0500
summary:     correct DOS line endings

codeticket:  219991
included in: 219999
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14655">14655:fe7fe04ccc9a</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14649">14649:45a63ad4d737</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14654">14654:3aab4a54e6d9</a>
user:        Xiaohong Bao <bao@lindenlab.com>
date:        Fri Jan 28 21:23:35 2011 -0700
summary:     Automated merge with http://hg.secondlife.com/viewer-development

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