diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-12 18:24:05 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-12 18:24:05 -0400 |
| commit | 95fcff557f19712e23410a07751f2b571fead8a9 (patch) | |
| tree | 1eef32416e5e1c9c60d478ae674b2fe9a35d0c55 /BuildParams | |
| parent | 3ffc5dc09c186fe0ac57ac66b33bfc105ca01363 (diff) | |
| parent | a22e3df7e5570e52abcba4a28103c3d76960a010 (diff) | |
fixed merge conflict in .hgtags
Diffstat (limited to 'BuildParams')
| -rw-r--r-- | BuildParams | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/BuildParams b/BuildParams index 5af6c7a21b..49bbb89615 100644 --- a/BuildParams +++ b/BuildParams @@ -66,7 +66,7 @@ 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-42 +viewer-pre-release.release-viewer.jira = DRTVWR-44 # ======================================= # brad @@ -155,7 +155,8 @@ media.build_viewer_update_version_manager = false # oz # ================ -oz_viewer-devreview.build_debug_release_separately = true +oz-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 |