summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorsimon <none@none>2014-04-21 12:36:35 -0700
committersimon <none@none>2014-04-21 12:36:35 -0700
commit0b9a777bfd3c85390c55d91fc3dc5c4bee9bf71b (patch)
treedd3f484813df4f1a74a525f3f6dddcbc91beac7c /BuildParams
parente606b7918dc6dbe2a4048f4bbd8590bfc3eca90e (diff)
parentc71e459bed68c1602d409e5c946c5e016d09d105 (diff)
Merge downstream code updating version to 3.7.7
Diffstat (limited to 'BuildParams')
-rwxr-xr-xBuildParams8
1 files changed, 8 insertions, 0 deletions
diff --git a/BuildParams b/BuildParams
index 7a6542dadc..51434a4912 100755
--- a/BuildParams
+++ b/BuildParams
@@ -168,6 +168,14 @@ simon_viewer-dev-private.email_status_this_is_os = false
vir-project-1.viewer_channel = "Second Life Release"
# ========================================
+# Merov
+# ========================================
+merov-viewer-maint-2287.viewer_channel = "Second Life Project Merchant Outbox"
+merov-viewer-maint-2287.login_channel = "Second Life Project Merchant Outbox"
+merov-viewer-maint-2287.build_viewer_update_version_manager = false
+merov-viewer-maint-2287.codeticket_add_context = false
+
+# ========================================
# THX-1138 / Runway projects
# ========================================
viewer-thx1138-runway-shared.viewer_channel = "Project Viewer - THX-1138 Runway"