diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:20:54 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:20:54 -0500 |
commit | b7c49f0f47f53d200df5afe4a4b68a83dd789918 (patch) | |
tree | 8941117f3f0384be524a8013cdd3b159642ebde1 /BuildParams | |
parent | 64c07135bab95b5425ddff69351f0c86301def97 (diff) | |
parent | 781bd2ce1956c32db72ec0d477edc44619f39f05 (diff) |
merge up from viewer-development and viewer-autobuild
Diffstat (limited to 'BuildParams')
-rw-r--r-- | BuildParams | 4 |
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 |