summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-17 18:46:17 -0500
committerOz Linden <oz@lindenlab.com>2011-02-17 18:46:17 -0500
commitcba34d7d4cdb0339113a4798965d595645d5cb49 (patch)
treeb74325f43d5757fdab1ce607b4f6aff94529e7b3 /BuildParams
parent0a262969e1da82fc95ec889f7aaafa4078bcf480 (diff)
parent76d67b1f78eb4e8dc11c962d998e06fe28653a4b (diff)
merge up from viewer-autobuild
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams4
1 files changed, 3 insertions, 1 deletions
diff --git a/BuildParams b/BuildParams
index 22cf93ad9c..26ca976b74 100644
--- a/BuildParams
+++ b/BuildParams
@@ -145,6 +145,7 @@ media.build_viewer_update_version_manager = false
# ================
L-oz_viewer-autobuild.build_link_parallel=false
+L-oz_viewer-autobuildvs2010.build_link_parallel=false
# ========================================
# enus
@@ -179,7 +180,8 @@ viewer-asset-delivery-metrics.build_server = false
viewer-asset-delivery-metrics.build_server_tests = false
#==============================================================================
-# viewer-autobuild
+# autobuild viewers
#==============================================================================
viewer-autobuild.build_link_parallel = false
+viewer-vs2010.build_link_parallel = false
# eof