summaryrefslogtreecommitdiff
path: root/indra/lscript/lscript_execute
AgeCommit message (Expand)Author
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
2009-04-16svn merge -r117314:117337Adam Moss
2009-02-24Fix exporting files list and legal headers on files that will be exported.Kelly Washington
2009-02-24merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunkKelly Washington
2009-02-06svn merge -r 108748:109731 svn+ssh://svn.lindenlab.com/svn/linden/branches/se...Robert Knop
2009-01-17svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-ser...Andrew Meadows
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-12-18QAR-1075 svn merge -r106114:106224 svn+ssh://svn.lindenlab.com/svn/linden/bra...Christian Goetze
2008-12-04Merging from server/server-1.25 back to trunk.Robert Knop
2008-09-17svn merge -r95195:96886 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Kyle Ambroff
2008-08-29svn merge -r94413:95195 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Kyle Ambroff
2008-08-14svn merge -r 93885:94413 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-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-11QAR-566 maint-viewer-5-merge-2Steven Bennetts
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
2008-04-28svn merge -r 84911:86069 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
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-09-28EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/lin...Don Kjer
2007-07-20svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
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-20svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroi...Karen Clark
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-02Print done when done.James Cook