summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Expand)Author
2013-08-05Merge downstream code - Vivox releasesimon
2013-08-05Merge viewer-release with Vivox codesimon
2013-07-11Merged in viewer-releaseAura Linden
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-04fix local build numbers when compiling a merge before committing (two parents)Oz Linden
2013-05-29Merge downstream codesimon
2013-05-29Merge latest viewer-releasesimon
2013-05-22merge changes for 3.5.3-releaseOz Linden
2013-05-21revise test for hg to detect and ignore incorrect results from cygwin hgOz Linden
2013-05-15Thanks mercurial.Aura Linden
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material...Graham Madarasz
2013-05-10Add BuildVersion.cmake to great chain of lifeGraham Madarasz
2013-05-10Merge with vwr-dev-matGraham Madarasz
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-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-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