summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Expand)Author
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-07merge changes for DRTVWR-299Oz Linden
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-26Appease TC cmake OCD about substring argsGraham Madarasz
2013-04-26Fix llmediadataclient test to include new dep on llprimitive and fix bogus bo...Graham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge up to latest viewer-development for merge to 3.5.2Oz Linden
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-18add newlineOz Linden
2013-04-18Blank line on end of files as per commit hook requirementscallum_linden
2013-04-17fix for missed merge changescallum_linden
2013-04-17Merge with viewer-developmentcallum_linden
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-03-29Google Breakpad Fix. Code reviewed by DavePGraham Madarasz (Graham Linden)
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28Google Breakpad FixGraham Madarasz (Graham Linden)
2013-03-27Fix breakpad breakage from linux API diffsGraham Madarasz
2013-03-27Rollback the boost sys lib inclusion in integ tests as it was causing dup sym...Graham Madarasz
2013-03-27Fix API diffs with new breakpad and point at private breakpad packages to testGraham Madarasz
2013-03-26Add Boost System library to all testsOz Linden
2013-03-22merge with viewer-releaseRichard Linden
2013-03-12Mods to make compile on gcc 4.6.3 work mo bettaGraham Madarasz
2013-03-12Fix linux_crash_logger freetype fail (now finds prebuilts as it should)Graham Madarasz
2013-03-12Merged lindenlab/viewer-cat into defaultgraham linden
2013-03-12Restore cmake to use 10.6 hacked locally to 10.8 of which TC does not approveGraham Madarasz (Graham Linden)
2013-03-12Merge pragma warning hack to fix linux buildGraham Madarasz (Graham Linden)
2013-03-12Fix -Wno-uninitialized disableGraham Madarasz (Graham Linden)
2013-03-12CMake hack to work around gcc-4.1 lack of pragma warning disable processing.Graham Madarasz (Graham Linden)
2013-02-22Merge new boost and add OS X 10.8 modsGraham Madarasz (Graham Linden)
2013-02-21MAINT-2389: Change viewer to Boost package without ucontext.h.Nat Goodspeed
2013-02-15Added ca-bundle.crt behaviors for Mac and Windows.Aura Linden
2013-02-04Nix trying to copy the debug fmod DLLGraham Madarasz (Graham)
2013-02-04More path fixups in stagingGraham Madarasz (Graham)
2013-02-04Dos2Unix Line endingsSovereign Engineer
2013-02-01Added copy of libfmodex .so for linuxGraham Madarasz (Graham)
2013-02-01Removed (most) references to older FMOD library - still a little Linux clean ...callum_linden
2013-01-24merging in viewer-beta.Nyx Linden
2013-01-18first push - patch from CmdCupCake plus force FMODEX oncallum_linden
2013-01-14Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2013-01-10removed compiler flag not understood by OS X version of gccAndrew Meadows
2013-01-08Automated merge with https://bitbucket.org/lindenlab/viewer-tigerDave Parks
2013-01-08merge changes for DRTVWR-250Oz Linden
2013-01-04Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden