Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-10-13 | correct licenses (fix problem with license change merge) | Oz Linden | |
2010-02-03 | Skip fragile (local ISP dependent) llhttpclient integration test. | Nat Goodspeed | |
2009-07-16 | Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2. | Mark Palange | |
merged all changes, post copy, from the following branches: linden/brachnes/enable-o-v user/cg/qar-1538 user/mani/viewer2-enable-o-v | |||
2009-01-08 | Result of svn merge -r107256:107258 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | |||
2008-12-18 | Result of svn merge -r105061:106057 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/user/phoenix/upgrade-tut into trunk. QAR-1074 | |||
2008-06-28 | svn merge -c 90839 ↵ | Christian Goetze | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/tulla/file-move-merge | |||
2008-02-14 | svn merge -r 79730:79944 ↵ | Josh Bell | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release QAR-275 Parcel Media Sam made me do it. | |||
2008-02-05 | do not attempt to use secondlife.com in unit tests for now. | Aaron Brashears | |
2007-12-21 | svn merge -r74200:76302 ↵ | Josh Bell | |
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome. | |||
2007-10-04 | Result of svn merge -r71162:71205 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | |||
2007-05-04 | svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
release | |||
2007-05-02 | svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵ | Don Kjer | |
release | |||
2007-05-01 | svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ↵ | Don Kjer | |
into release | |||
2007-03-05 | merge r58577:58578 Branch_1-13-3 to release | Kelly Washington | |
2007-02-09 | Result of svn merge -r57350:57790 ↵ | Aaron Brashears | |
svn+ssh://svn/svn/linden/branches/os-patches.001 into release. | |||
2007-02-06 | merge in of error-refactor-3 | Mark Lentczner | |
concludes (fixes) SL-31187 pair programmed and reviewed by markl and karen | |||
2007-01-02 | Print done when done. | James Cook | |