summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Expand)Author
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-08-07svn merge -r 93444:93885 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-07-31svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-...Dave Hiller
2008-07-28svn merge -r 93027:93128 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-07-23svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-pi...Karl Steifvater
2008-07-22svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> re...Josh Bell
2008-07-22merge uv-picking branch.Karl Steifvater
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-25svn merge -r90394:90492 svn/branches/havok4/qar-689 --> releaseDave Simmons
2008-06-21svn merge -r90150:90340 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-6...Kyle Ambroff
2008-06-06svn merge -r 88872:89137 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-652 --...Josh Bell
2008-06-02svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake...Bryan O'Sullivan
2008-05-19EFFECTIVE MERGES:Don Kjer
2008-05-14Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .Eric Tulla
2008-05-13svn merge -r 87164:87466 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-05-13svn merge -r87349:87423 svn+ssh://svn.lindenlab.com/svn/linden/branches/escro...Ryan Williams
2008-05-11QAR-566 maint-viewer-5-merge-2Steven Bennetts
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
2008-05-07svn merge -r 86558:86977 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://sv...Brian McGroarty
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenl...Brian McGroarty
2008-04-29Result of svn merge -r85981:85991 svn+ssh://svn/svn/linden/branches/ssl-sani...Aaron Brashears
2008-04-28svn merge -r 84911:86069 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-04-16svn merge -r84476:84911 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Dave Kaprielian
2008-04-10svn merge -r84490:84497 svn+ssh://svn/svn/linden/branches/DEV-11812-3Leyla Farazha
2008-04-09Result of svn merge -r84383:84400 svn+ssh://svn/svn/linden/branches/migrate-s...Aaron Brashears
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-03svn merge -r 83778:83944 maint-ui-10-mergeJames Cook
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-25svn merge -r 82869:83166 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-03-21svn merge -r 82563:82869 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
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-13svn merge -r 82118:82122 svn+ssh://svn.lindenlab.com/svn/linden/qa/dpo-12-mer...Josh Bell
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
2008-03-07svn merge -r 80990:81720 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-03-04svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2008-03-03svn merge -r81155:81167 svn+ssh://svn.lindenlab.com/svn/linden/branches/dev-8...Bryan O'Sullivan
2008-02-29svn merge -r 81153:81152 .Bryan O'Sullivan
2008-02-29svn merge -r80434:80633 svn+ssh://svn.lindenlab.com/svn/linden/branches/dev-8000Bryan O'Sullivan
2008-02-28svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
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-13merge elar-merge-3 -r 79884 : 79923 -> releaseSteven Bennetts
2008-02-13svn merge -r 79828:79862 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merg...Josh Bell
2008-02-12svn merge -r 79680:79822 svn+ssh://svn.lindenlab.com/svn/linden/branches/merg...Josh Bell
2008-02-08Result of svn merge -r79554:79558 svn+ssh://svn/svn/linden/branches/merge-dp ...Aaron Brashears