Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-10-13 | correct licenses (fix problem with license change merge) | Oz Linden | |
2009-08-31 | Merge with trunk | Bryan O'Sullivan | |
2009-07-15 | svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691 | Christian Goetze | |
Effective merge: svn merge -r125827:127126 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27 QAR-1691 | |||
2009-07-01 | svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654 | Christian Goetze | |
QAR-1654 merge completed. | |||
2009-06-21 | merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 | Steven Bennetts | |
ignore-dead-branch | |||
2009-04-01 | QAR-1284 ip-takedown tools simulator work is ready for merge | Andrew Meadows | |
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5 no conflicts |