summaryrefslogtreecommitdiff
path: root/indra/cmake
AgeCommit message (Expand)Author
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-06-05MergeRicky Curtice
2014-05-19mergeBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-04-23merge changes for STORM-1831Oz Linden
2014-04-22catch a few more cases of STANDALONE -> USESYSTEMLIBSOz Linden
2014-04-22merge changes for OPEN-199Oz Linden
2014-04-08mergeBrad Payne (Vir Linden)
2014-04-08merge changes for 3.7.5-releaseOz Linden
2014-04-07merge with releaseRichard Linden
2014-03-31mergeBrad Payne (Vir Linden)
2014-03-24merge with releaseRichard Linden
2014-04-07Merge in viewer-release and version update to 3.7.6simon
2014-04-01OPEN-210 FMOD Ex include confusion. Revert FMODEX.cmakeMonty Brandenberg
2014-03-24Merged in viewer-release.Aura Linden
2014-03-19OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBSOz Linden
2014-03-14Additions & fixes for lib copy, use only forwarded ptrs in LLAE interfaces.Monty Brandenberg
2014-03-14Update fmodex to 4.44.31. Move DSP descriptor to heap storage.Monty Brandenberg
2014-01-09fixed unit tests being generated as Windows GUI projects instead of console p...Richard Linden
2013-12-03Creating a cleaner branchAura Linden
2013-11-18merge changes for STORM-1831Oz Linden
2013-11-06merge with releaseRichard Linden
2013-10-29Merge viewer-release => sunshine-internalDon Kjer
2013-10-18storm-1831 Incorporating Oz's changes to update libxml on linux to libxml2Ima Mechanique
2013-10-16mergeBrad Payne (Vir 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-10mergeBrad Payne (Vir 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-09-04mergeBrad Payne (Vir Linden)
2013-08-27merge changes for 3.6.4-releaseOz Linden
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-22mergeBrad Payne (Vir Linden)
2013-08-19MergeXiaohong Bao
2013-08-19merge changes for 3.6.3-releaseOz Linden
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-08-16merge with viewer-releaseNyx 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