diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-04-23 12:47:23 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-04-23 12:47:23 -0700 |
| commit | 1953c569a6acfd731af2c459da7a6928be4aaf5b (patch) | |
| tree | f5e66a37eed56d418ad3fab290645a8ce4da943f /BuildParams | |
| parent | 8fd239233dca9639c6d0139e8f697da97bfe036e (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Merge with viewer-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" |