summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
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-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-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-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-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
2009-06-22Python 2.4 and 2.6 improvementsBryan 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-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-02Small brainoBryan O'Sullivan
2009-05-22svn merge -r121194:121210Adam Moss
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-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-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
2009-05-18Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_da...Aaron Brashears
2009-05-14Set DISTCC_DIR to a location inside the source tree to avoid causing NFS trou...Christian Goetze
2009-05-14Max out distcc jobs to 12 in develop.pyChristian Goetze
2009-05-14There are 71 eniacs, not just 64Christian Goetze
2009-05-14Make develop.py work on eniacs the same way it works on stationsChristian Goetze
2009-05-11Another line ending changeBryan O'Sullivan
2009-05-11Switch the XML file line endings to native.Bryan O'Sullivan
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-20Retry. Build system fixes for library-library dependencies, ported from skin...James Cook
2009-04-17Back out last commit, because it breaks mapserver build on linux, dammit.James Cook
2009-04-17Build system fixes for library-library dependencies, ported from skinning-7. ...James Cook
2009-04-16svn merge -r117314:117337Adam Moss
2009-04-15Turn the artwork tree back into a downloaded package, but revision-controlBryan O'Sullivan
2009-04-14Missed a file.Bryan O'Sullivan
2009-04-14Re-add character data.Bryan O'Sullivan
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-09This is causing open source build problems - cherrypicked DEV-29644 VWR-12587...Brian McGroarty
2009-04-09Get 32-bit builds going on 64-bit Debian Etch.Bryan O'Sullivan
2009-04-09svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Robert Knop