summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-25 17:11:56 -0500
committerOz Linden <oz@lindenlab.com>2011-01-25 17:11:56 -0500
commit8b2b0ba2df1f21490f6cf454a5f62cf5f7b4f833 (patch)
tree3fefa4114242238bbc97bd16c506ee9e9e405e07 /BuildParams
parent714ba52df0397b58769e02ae9a7d9877a4505d34 (diff)
parent93138ec2cbd5a9707a7ade1acc6ef35fbc50b422 (diff)
Automated merge with file:///Users/oz/Work/V-D
Diffstat (limited to 'BuildParams')
-rw-r--r--BuildParams5
1 files changed, 4 insertions, 1 deletions
diff --git a/BuildParams b/BuildParams
index 0a4271f7a8..5557b8db8a 100644
--- a/BuildParams
+++ b/BuildParams
@@ -233,5 +233,8 @@ viewer-asset-delivery-metrics.email = monty@lindenlab.com
viewer-asset-delivery-metrics.build_server = false
viewer-asset-delivery-metrics.build_server_tests = false
-
+#==============================================================================
+# viewer-autobuild
+#==============================================================================
+viewer-autobuild.build_link_parallel = false
# eof