summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Expand)Author
2008-04-17Undid previous commit (bogus merge)Steven Bennetts
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
2008-04-16QAR-455 Launcher and Heartbeat fixes MergeMeAdam Moss
2008-04-16svn merge -r84476:84911 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Dave Kaprielian
2008-04-09Result of svn merge -r84383:84400 svn+ssh://svn/svn/linden/branches/migrate-s...Aaron Brashears
2008-04-09svn merge -r83893:84415 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Dave Kaprielian
2008-04-08svn merge -r84080:84255 svn+ssh://svn/svn/linden/branches/intermezzo-9Leyla Farazha
2008-04-03svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/releaseKelly Washington
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-31svn merge -r 83166:83647 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-03-25merge release@82858 maint-render-2-merge@83010 -> releaseSteven Bennetts
2008-03-25svn merge -r 82869:83166 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-03-20merge release@82383 viewer-cleanup2-7-merge@82828Steven Bennetts
2008-03-19QAR-377 maintenance-6 merge:Brian McGroarty
2008-03-18svn merge -r 82263:82563 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-03-15reverting premature commit at 82410.Steven Bennetts
2008-03-14[NOTE: This was an erroneous commit, and was reverted in the next revision]Mark Palange
2008-03-14svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2008-03-13svn merge -r 81720:82231 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
2008-03-10QAR-345 merge windlight scriptglow3 into releaseBrad Kittenbrink
2008-03-07svn merge -r 80990:81720 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-29svn merge -r80947:81066 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2008-02-28svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-28merge Branch_1-19-0-Viewer -r 80279 : 80947 -> releaseSteven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2008-02-20svn merge -r 80160:80357 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-19merge -r 78989:80279 Branch_1-19-0-Viewer-> releaseSteven Bennetts
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2008-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell
2008-02-07svn merge -r 79445:79449 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2008-02-05svn merge -r 78407:79136 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-01merge Branch_1-19-0-Viewer -r 78432:78989 -> releaseSteven Bennetts
2008-01-28svn merge -r 78408:78432 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-01-24svn merge -r 78173:78397 search-milestone2-1 for classified click-through log...James Cook
2008-01-24svn merge -r 77415:77842 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Jon Wolk
2008-01-24DEV-9328 DEV-9330 DEV-9334 Fixed license information in source files to match...James Cook
2008-01-12svn merge -r76807:77355 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2008-01-03svn merge -r76651:76807 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2008-01-03svn merge -r76207:76805 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2007-12-29D'oh, try compiling before committing. (If it's any justification, CG was com...Josh Bell
2007-12-29svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenanc...Josh Bell
2007-12-28svn merge -r 76394:76651 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...James Cook
2007-12-21svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2007-12-20svn merge -r74912:76207 svn+ssh://svn/svn/linden/branches/Branch_1-18-6-Serv...Christian Goetze
2007-12-19svn merge -r75015:75150 svn+ssh://svn/svn/linden/branches/security-lsl-setnam...Josh Bell
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-12-07EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-m...Steven Bennetts
2007-12-06Switching from XML streaming to Notation streaming for new streambase logging...Don Kjer