summaryrefslogtreecommitdiff
path: root/indra/lscript
AgeCommit message (Expand)Author
2009-09-16DEV-31898: merging the fix for this bug into viewer-2.0.0-3 so that itMartin Reddy
2009-09-01Fix up some more post-merge breakage.brad kittenbrink
2009-09-01Merged login-api with viewer-2.0.0-3 up through r132290.brad kittenbrink
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-29Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2...Steven Bennetts
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 m...brad kittenbrink
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-07-15svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691Christian Goetze
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
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-10-31Fix more silly printf crasher holesBryan O'Sullivan
2008-10-07QAR-829: svn merge -r98245:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branch...Kent Quirk
2008-10-01svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Christian Goetze
2008-09-17svn merge -r95195:96886 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Kyle Ambroff
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
2008-09-05svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-serve...Andrew Meadows
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-08-13QAR-782 Merge featurettes batch #2Steven Bennetts
2008-07-31svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-...Dave Hiller
2008-07-27Explicitly mark the generated files with the GENERATED property to make sure ...Kyle McKay
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-06-27QAR-669 1.20 Viewer RC11Steven Bennetts
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 21:00:41 +0000