diff options
| author | simon <none@none> | 2014-04-21 13:04:07 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-21 13:04:07 -0700 |
| commit | fdb28bccb92d121f1b3dfc068a50d5cc3db43ce9 (patch) | |
| tree | 391f32cc407d6e9c14bd4804b7ece4f53df3250c /BuildParams | |
| parent | 80eafe2ff3b235b6355ae2f20e8301374623e6ea (diff) | |
| parent | a5a0a0b1362da5d00cc6d09bb841ef6167bb2922 (diff) | |
Merge downstream code
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" |