diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-21 16:21:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-21 16:21:31 -0400 |
| commit | b1a7137ba6e56e1b692205f129d86acc942209e9 (patch) | |
| tree | 595b9e3a2b9e4be799459e06c9b33793013d0ae0 /BuildParams | |
| parent | 32bbb07f0a727b5aa318ba3c32764ec29cc96956 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
merge changes for 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 35b1ab2641..3e04d1ce29 100755 --- a/BuildParams +++ b/BuildParams @@ -137,6 +137,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" |