diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:23:39 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-04-20 11:23:39 -0400 |
commit | 38306a2bbbcaaa0825db88aab39f7d10943f9af3 (patch) | |
tree | ab5f360c6537510303da006a7678124c3134613b /BuildParams | |
parent | 6715603b6a991f822274b000e5d8fb9b8d405464 (diff) | |
parent | da7cd9f8117757cd6acb0a5e93bc3c60443374f9 (diff) |
automated merge viewer-pre-beta -> seraph-viewer-pre-beta
Diffstat (limited to 'BuildParams')
-rw-r--r-- | BuildParams | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/BuildParams b/BuildParams index deaea5e047..f8d078250b 100644 --- a/BuildParams +++ b/BuildParams @@ -67,10 +67,11 @@ 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-42 + + # ======================================= # brad # ======================================== - debug-halting.email = cg@lindenlab.com debug-halting.build_server = false debug-halting.build_server_tests = false @@ -154,13 +155,12 @@ media.build_viewer_update_version_manager = false # oz # ================ -oz-viewer-devreview.build_debug_release_separately = true -viewer-devreview.build_debug_release_separately = true -oz_viewer-poreview.build_debug_release_separately = true +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 + # ======================================== # enus # ======================================== |