summaryrefslogtreecommitdiff
path: root/scripts
AgeCommit message (Expand)Author
2009-07-29svn merge -c 128669 svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-4Dave Simmons
2009-07-24For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"Loren Shih
2009-06-24merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-...Loren Shih
2009-06-22Python 2.4 and 2.6 improvementsBryan O'Sullivan
2009-05-19svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-05-18Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_da...Aaron Brashears
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
2009-04-30svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/...Christian Goetze
2009-04-21svn merge -r117696:117697 svn+ssh://svn.lindenlab.com/svn/linden/branches/fix...Kelly Washington
2009-04-13merge -r116796:116932 svn+ssh://svn.lindenlab.com/svn/linden/branches/http-te...Christian Goetze
2009-04-10Working around DEV-30401 by yanking the etch 32bit build code until the viewe...Christian Goetze
2009-04-09Get 32-bit builds going on 64-bit Debian Etch.Bryan O'Sullivan
2009-03-20svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Dave Simmons
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-02-25svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-02-24Drop linux32 support from install.xml and install.py, since unused and untestedBryan O'Sullivan
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-12-29make it easer for developers to examine list output by sorting the results pr...Aaron Brashears
2008-12-04Merging from server/server-1.25 back to trunk.Robert Knop
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
2008-11-19QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:...James Cook
2008-10-28someone added a directory to a file list in one of the prepacked libs. just i...Aaron Brashears
2008-10-10svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andre...Andrew Meadows
2008-10-08merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
2008-10-07Roll back of r98854 Accidentally commited merge in progressMark Palange
2008-10-07merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
2008-10-07svn merge -r98039:98711 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Kyle Ambroff
2008-08-19- install.xml updated with versions of tarfiles which no longer contain debug...Jennifer Leech
2008-07-31svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-...Dave Hiller
2008-07-25Tweak output of test_all_platforms.pyChristian Goetze
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-18merge support-featurettes-snapshot-merge-2 for QAR-754, includes:James Cook
2008-06-26svn merge -r89701:90677 svn+ssh://svn/svn/linden/branches/install-dev-binarie...Jennifer Leech
2008-06-23Make the output of install.py --list readableBryan O'Sullivan
2008-06-21svn merge -r90150:90340 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-6...Kyle Ambroff
2008-06-12svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binarie...Jennifer Leech
2008-06-02svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake...Bryan O'Sullivan
2008-04-28svn merge -r 84911:86069 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
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-02-14Simplify dir joining in setup-pathJosh Bell
2008-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell
2008-02-11$ svn merge -c79668 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-3Christian Goetze
2008-01-15Handle SVN not being set as an environment variable.Josh Bell
2008-01-15Make update_version_files.py look in the environment for the location ofChristian Goetze
2008-01-15Added workaround for popen bug in scripts/update_version_files.pyChristian Goetze
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-12-06EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/F...Don Kjer