summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Expand)Author
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
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-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-19QAR-377 maintenance-6 merge:Brian McGroarty
2008-03-12svn merge -r 82016:82020 svn+ssh://svn.lindenlab.com/svn/linden/branches/sing...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-02-28svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-16svn merge -r 80024:80160 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-12-14svn merge -c 73823 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenanc...Josh Bell
2007-11-15merge of age verification changes from QAR-76 to release; changes were origin...Kent Quirk
2007-11-01svn merge -r 72356:72879 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-11-01svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-s...Josh Bell
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-10-04Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-ex...Aaron Brashears
2007-09-10Result of svn merge -r69150:69158 svn+ssh://svn/svn/linden/branches/named-que...Aaron Brashears
2007-07-20svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-07-02svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-06-17svn merge -r 63833:63894 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-06-13result of merge manually performed through diff and patch. svn diff svn+ssh:/...Aaron Brashears
2007-05-30merge -r61423:62602 svn/branches/maintenance --> releaseKelly Washington
2007-05-08svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-03-21svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-20svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroi...Karen Clark
2007-03-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
2007-03-14svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn....Josh Bell
2007-03-05svn merge -r 58117:58118 svn+ssh://svn.lindenlab.com/svn/linden/branches/rele...Josh Bell
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-02-15merge -r 57761:57967 im-email-session-3, removes database load from IM to ema...James Cook
2007-02-02Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r4...Aaron Brashears
2007-01-24merge -r 56696:57082 Branch_1-13-2Steven Bennetts
2007-01-04Result of svn merge -r56461:56474 svn+ssh://svn/svn/linden/branches/llscene-s...Aaron Brashears
2007-01-02Print done when done.James Cook