summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Expand)Author
2013-11-06merge with releaseRichard Linden
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-08merge from viewer-releaseRichard Linden
2013-09-20MAINT-3172 fix rendering regressions from release mergedownGraham Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-09-09Merge viewer-releasesimon
2013-09-05open-183: improve local build number generation to account for multiple headsOz Linden
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-19MergeXiaohong Bao
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-08-05Merge downstream code - Vivox releasesimon
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-08-05Merge viewer-release with Vivox codesimon
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-07-16OPEN-182: correct tip rev number use in local build version generationOz Linden
2013-07-11Merged in viewer-releaseAura Linden
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20merge with releaseRichard Linden
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-19Merge with viewer-release.Geenz
2013-06-17The viewer now requires the 10.7 SDK or above to compile.Geenz
2013-06-17Merged with viewer-releaseGeenz
2013-06-05merge with viewer-releaseRichard Linden
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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 11:06:00 +0000