summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2009-09-08Merge with SVN trunkBryan O'Sullivan
2009-09-04svn merge -r132607:132665 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Christian Goetze
2009-09-04svn merge -r 129999:132607 svn+ssh://svn/svn/linden/branches/server/server-1....Don Kjer
2009-08-26Add Mercurial-specific build version info.Bryan O'Sullivan
2009-08-11Merge with SVN trunkBryan O'Sullivan
2009-08-09svn merge -r128876:129999 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Kyle Ambroff
2009-07-31Merge with SVN trunkBryan O'Sullivan
2009-07-30Bump trunk version to 1.31Christian Goetze
2009-07-30Reduce job count for linux builds to something the build farm can surviveChristian Goetze
2009-07-29svn merge -r128774:128808 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1737Christian Goetze
2009-07-29svn merge -c 128669 svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-4Dave Simmons
2009-07-28MergeBryan O'Sullivan
2009-07-28Merge with SVN trunkBryan O'Sullivan
2009-07-24Merge with an oldish change of mineBryan O'Sullivan
2009-07-24For QAR-1710 : Server merge for QAR-1594 QAR-1643 QAR-1644 - "AVP Changes [SIM]"Loren Shih
2009-07-22Merge of Parcel API V1 to trunk for 1.30 release. Hallelujah!Monty Brandenberg
2009-07-21Merge with SVN trunkBryan O'Sullivan
2009-07-16Make googlemock publicly availableChristian Goetze
2009-07-15svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691Christian Goetze
2009-07-14QAR-1651Dave Hiller
2009-07-07svn merge -r 126003:126087 svn+ssh://svn/svn/linden/qa/light-texture-params...Don Kjer
2009-07-01Merge with SVN trunkBryan O'Sullivan
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
2009-06-25Ignore distcc state directoryBryan O'Sullivan
2009-06-22Merge with SVN trunkBryan O'Sullivan
2009-06-22Python 2.4 and 2.6 improvementsBryan O'Sullivan
2009-06-22Merge with SVN trunkBryan O'Sullivan
2009-06-20svn merge -r124872:124873Adam Moss
2009-06-19result of "svn merge -r123757:124890 svn+ssh://svn.lindenlab.com/svn/linden/b...Paul Oppenheim
2009-06-11Merge with SVN trunkBryan O'Sullivan
2009-06-11Merge with SabinBryan O'Sullivan
2009-06-04Fix one more license, add indra/newview/tests to exported treeChristian Goetze
2009-06-04Fix licensing, also make the unzipping quieter, so that license error message...Christian Goetze
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
2009-06-03Remove -parallelizeTargets from xcodebuild invocation, it seems to not work w...Christian Goetze
2009-06-02Merge with SVN trunkBryan O'Sullivan
2009-06-02Small brainoBryan O'Sullivan
2009-05-29Merge with SVN trunkBryan O'Sullivan
2009-05-22svn merge -r121194:121210Adam Moss
2009-05-21Merge with SVN trunkBryan O'Sullivan
2009-05-21Put the os.environ["DISTCC"] = ... call into main()Christian Goetze
2009-05-21Fix develop.py putenv bug, use new etch build-linux hosts for parabuild.Christian Goetze
2009-05-21os.putenv doesn't do what we want, replaced with os.environ instead.David Kaprielian
2009-05-20Merge with SVN trunkBryan O'Sullivan
2009-05-20Windows: make dbghelp.dll an installable packageBryan O'Sullivan
2009-05-19Fix to develop.py to build on 64 bit windows.Mark Palange
2009-05-19Merge with SVN trunkBryan O'Sullivan
2009-05-19Now that 1.27 has branched away, bumping the version number to 1.29 toRobert Knop
2009-05-19svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop
2009-05-19Adding back the setting of "DEBUG", the lack of which caused many unitRobert Knop