summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Expand)Author
2013-10-21STORM-1831 First attempt at using SyntaxIdLSL capability. (incomplete)Ima Mechanique
2013-10-15Renaming file to better reflect it's actual usage for the future.Ima Mechanique
2013-10-04Merge v3.6.7 inIma Mechanique
2013-09-09Merge viewer-releasesimon
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-05Merge downstream code - Vivox releasesimon
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05correct coding standards problemsOz Linden
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-07-24merge up to latest snowstorm integration branchOz Linden
2013-07-11Merged in viewer-releaseAura Linden
2013-06-28Removing app_setting/keywords_lsl_colors.xml from CMake build file.Ima Mechanique
2013-06-26Merging last four months of developmentIma Mechanique
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-19Merge with viewer-release.Geenz
2013-06-17Merged with viewer-releaseGeenz
2013-05-29Merge downstream codesimon
2013-05-22merge changes for 3.5.3-releaseOz Linden
2013-05-21CHOP-947: create summary.json (really python) metadata file for TeamCity resultsOz Linden
2013-05-15Thanks mercurial.Aura Linden
2013-05-14Fix incorrect generation of Info.plist. Use a custom Info.plist template here.Geenz
2013-05-13Merged with https://bitbucket.org/lindenlab/viewer-betaGeenz
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material...Graham Madarasz
2013-05-10Fixup merge diffsGraham Madarasz
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-09Merge downstream code and viewer-betasimon
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-07merge changes for DRTVWR-299Oz Linden
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-30Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XMLGraham 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-17Merge with viewer-developmentcallum_linden
2013-04-16merge up to 3.5.2 developmentOz Linden
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-01merge changes for 3.5.0-beta7Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28MAINT-2426 : Viewer support for new simulator AvatarRenderInfo capability. R...simon
2013-03-27New gmock with WChar fix and add boost sys lib to viewer source testsGraham Madarasz
2013-03-27Rollback the boost sys lib inclusion in integ tests as it was causing dup sym...Graham Madarasz
2013-03-26Add Boost System library to all testsOz Linden
2013-03-25Pull and merge downstream code with CHUI viewer-development by way of viewer-...simon
2013-03-25merge changes for storm-1911Oz Linden
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-11Viewer-chui mergeprep
2013-02-22Merge new boost and add OS X 10.8 modsGraham Madarasz (Graham Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 06:29:35 +0000