summaryrefslogtreecommitdiff
path: root/indra/lscript
AgeCommit message (Expand)Author
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-19svn merge -r 89027:90119 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...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-11QAR-566 maint-viewer-5-merge-2Steven Bennetts
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-30Workaround for cygwin flex 2.5.35 bug.Steven Bennetts
2008-04-28svn merge -r 84911:86069 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2008-04-09svn merge -r83893:84415 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Dave Kaprielian
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-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
2008-02-13svn merge -r 79455:79892 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-11-20Reverting accidental changes from age-verification merge (only affects vc8 bu...Steven Bennetts
2007-11-15merge of age verification changes from QAR-76 to release; changes were origin...Kent Quirk
2007-11-08Reverting unintentional commit of indra.lSteven Bennetts
2007-11-07Removied viewer.h from macview_prefix.hSteven Bennetts
2007-11-05merge -r71488:71881 svn+ssh://svn.lindenlab.com/svn/linden/branches/flex-biso...Karl Steifvater
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-28EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/lin...Don Kjer
2007-09-13svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/m...Christian Goetze
2007-07-26merge -r66262:66263 linden/branches/kelly/llgetobjectdetails-2Kelly Washington
2007-07-26EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/m...Don Kjer
2007-07-20svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-07-18svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint...Bryan O'Sullivan
2007-07-12svn merge -r65092:65220 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint...Bryan O'Sullivan
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-04svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn....Brad Kittenbrink
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-04-11svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-26Effectively: merge 59238:59702 Branch_1-13-4 --> release EXCEPT for the back ...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-02-20svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-02-09Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patche...Aaron Brashears
2007-02-02Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r4...Aaron Brashears
2007-01-18Result of svn merge -r56700:56797 svn+ssh://svn/svn/linden/branches/more-rand...Aaron Brashears
2007-01-18merge -r 56738:56842 maintenance.Steven Bennetts
2007-01-15svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 20:16:26 +0000