diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-04-22 16:34:30 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-04-22 16:34:30 -0700 |
| commit | f515e2b1ee601958ba642d638e929daf7ff6e92a (patch) | |
| tree | 2622bea403aad589701d7a176d1de59d32af6d77 /BuildParams | |
| parent | 90a42d43b255eca082c283e5a0dfabd4ebfce508 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Merge with 3.7.6-release
Diffstat (limited to 'BuildParams')
| -rwxr-xr-x | BuildParams | 8 |
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" |