e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
dc48f1c741
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
...
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448
2008-04-03 22:50:22 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
1a33bc19b4
svn merge -r 62595:62596 and 62598:63308 sse-skinning-3 for faster software avatar rendering. Visual Studio 2005 project file fixed pending.
2007-07-02 23:52:40 +00:00
c189fc0b57
Result of svn merge -r56700:56797 svn+ssh://svn/svn/linden/branches/more-random into release.
2007-01-18 00:44:48 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Aaron Brashears