diff options
author | Don Kjer <don@lindenlab.com> | 2011-04-14 18:27:31 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-04-14 18:27:31 +0000 |
commit | 01f4570c795b197e74bfa96139631c43df8d0664 (patch) | |
tree | 7c1952cc51adec21025f537281e59f828e75224d /BuildParams | |
parent | 2bf967149626672584b17b53fb5d2e6186f3d896 (diff) | |
parent | 88a7262340f2fc5085f4ac6600790518d01292d6 (diff) |
Merge with viewer-development
Diffstat (limited to 'BuildParams')
-rw-r--r-- | BuildParams | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/BuildParams b/BuildParams index 9f962d45d3..3b711397e3 100644 --- a/BuildParams +++ b/BuildParams @@ -66,7 +66,8 @@ viewer-pre-release.viewer_channel = "Second Life Release" 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-39 +#viewer-pre-release.release-viewer.jira = DRTVWR-13 + # ======================================= # brad # ======================================== @@ -154,12 +155,10 @@ 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-project-1.build_debug_release_separately = true -oz-project-2.build_debug_release_separately = true -oz-project-3.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 |