summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Expand)Author
2014-08-04Merge. Refresh from viewer-release after 3.7.13 release.Monty Brandenberg
2014-07-10merge changes for 3.7.12-releasemaksymsproductengine
2014-07-08Merge. Refresh from viewer-release after 3.7.11 release.Monty Brandenberg
2014-06-23Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseMonty Brandenberg
2014-06-23merge changes for 3.7.10-releaseOz Linden
2014-06-23viewer-release mergeChris Baker
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-06-16viewer-release mergeChris Baker
2014-06-16Merge. Refresh from viewer-release after 3.7.9 release.Monty Brandenberg
2014-06-16merge changes for 3.7.9-releaseOz Linden
2014-06-07Merge upstreamCinder
2014-06-05MergeRicky Curtice
2014-05-22Merge. Pull in viewer-release after release of 3.7.8Monty Brandenberg
2014-05-19Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-19mergeBrad Payne (Vir Linden)
2014-05-14Begin syntax coloring personalizationCinder
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-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile er...Merov Linden
2014-04-23merge changes for STORM-1831Oz Linden
2014-04-22merge changes for OPEN-199Oz Linden
2014-04-18Begin moving script editor portions of LLTextEditor to their own derived class.Cinder
2014-04-15Linux/Win: Bad checksum on Windows package. Libz and libpng linking changes...Monty Brandenberg
2014-04-08mergeBrad Payne (Vir Linden)
2014-04-08merge changes for 3.7.5-releaseOz Linden
2014-04-07merge with releaseRichard Linden
2014-04-07Pull merge from lindenlab/viewer-releaseMerov Linden
2014-04-04Library updates and switch to 3d-llqtwebkit2 build products.Monty Brandenberg
2014-04-07Merge in viewer-release and version update to 3.7.6simon
2014-03-19OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBSOz Linden
2014-02-25ACME-1327 : WIP : Added big preview to the Flickr photo panel, uses the thumb...Merov Linden
2014-02-25merge changes for 3.7.2-releaseOz Linden
2014-02-24Pulled from release.obscurestar
2014-02-12merge with releaseRichard Linden
2014-02-11mergeBrad Payne (Vir Linden)
2014-02-10Merge pull from lindenlab/viewer-releaseMerov Linden
2014-02-10Merge downstream code with viewer-releasesimon
2014-01-09ACME-1244 : WIP : Move files around and introduced an llimagefiltersmanager t...Merov Linden
2014-01-07merge changes for 3.6.12-releaseOz Linden
2014-01-03merge changes for 3.6.12-releaseOz Linden
2013-12-21MAINT-3587 FIXED settings.xml still references avatarsunited.com for snapshot...maksymsproductengine
2013-12-12Pull merge from lindenlab/viewer-releaseMerov Linden
2013-12-10mergeBrad Payne (Vir Linden)
2013-12-09Pulled viewer-releaseAura Linden
2013-12-09merge with releaseRichard Linden
2013-12-05Renamed floater_social to floater_facebook for ACME-1205Cho
2013-12-03Creating a cleaner branchAura Linden
2014-05-08viewer-release merge (to 3.7.8)Baker Linden
2014-04-08merge viewer-releaseBaker Linden