diff options
author | Don Kjer <don@lindenlab.com> | 2011-04-26 18:01:18 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-04-26 18:01:18 +0000 |
commit | c14b5c644d75df31a1ef151262480cf875134da2 (patch) | |
tree | 9284620a254873585b637f625456c88e9e371436 /BuildParams | |
parent | 77791a88a9811f71cc9af668d28a903645436be0 (diff) | |
parent | b87cb90a55ed74d51587eec581fb57e29f510c41 (diff) |
Merge with viewer-development
Diffstat (limited to 'BuildParams')
-rw-r--r-- | BuildParams | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/BuildParams b/BuildParams index 3b711397e3..2cb58755e5 100644 --- a/BuildParams +++ b/BuildParams @@ -67,11 +67,12 @@ viewer-pre-release.login_channel = "Second Life Release" viewer-pre-release.build_debug_release_separately = true viewer-pre-release.build_viewer_update_version_manager = true #viewer-pre-release.release-viewer.jira = DRTVWR-13 +viewer-pre-release.release-viewer.jira = DRTVWR-46 + # ======================================= # brad # ======================================== - debug-halting.email = cg@lindenlab.com debug-halting.build_server = false debug-halting.build_server_tests = false @@ -158,8 +159,10 @@ media.build_viewer_update_version_manager = false oz_viewer-devreview.build_debug_release_separately = true oz_project-1.build_debug_release_separately = true oz_project-2.build_debug_release_separately = true -oz_project-3.build_debug_release_separately = true +oz-project-3.build_debug_release_separately = true + +oz_viewer-beta-review.build_debug_release_separately = true # ======================================== # enus # ======================================== |