diff options
| author | Cho <cho@lindenlab.com> | 2014-04-24 23:44:47 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-04-24 23:44:47 +0100 |
| commit | 6cc318fda28a878186d35c79bf5474d4d1ac66d3 (patch) | |
| tree | 2cc623f32ec473931403613ca17ea9873938ed9b /BuildParams | |
| parent | 446a3193b1f2932ed14a16216bcf65dc30889612 (diff) | |
| parent | 80fcd6d9d42377fc09928eb99f26e6287c4b544d (diff) | |
merge
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" |