diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2011-03-30 17:46:51 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2011-03-30 17:46:51 -0700 |
| commit | 5c3ae68299f79f3a705fa4b3e9cd262b56695318 (patch) | |
| tree | 2090b1c339bf61dc2a8e5b39949a0a2b72845555 | |
| parent | f633aef1af5a1a695df655080d3a20c033a31e18 (diff) | |
| parent | 2c5b7cf2f7528a7502f4fe3f9c6dec9217f8ae60 (diff) | |
merged .hgtags from viewer-release
| -rw-r--r-- | .hgtags | 4 | ||||
| -rw-r--r-- | BuildParams | 3 |
2 files changed, 3 insertions, 4 deletions
@@ -87,5 +87,5 @@ c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-beta1 9e4641f4a7870c0f565a25a2971368d5a29516a1 DRTVWR-41_2.6.0-beta2 9e4641f4a7870c0f565a25a2971368d5a29516a1 2.6.0-beta2 56b2778c743c2a964d82e1caf11084d76a87de2c 2.6.2-start -c5bdef3aaa2744626aef3c217ce29e1900d357b3 DRTVWR-43_2.6.1-beta1 -c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-beta1 +42f32494bac475d0737799346f6831558ae8bf5d DRTVWR-39_2.6.0-release +42f32494bac475d0737799346f6831558ae8bf5d 2.6.0-release diff --git a/BuildParams b/BuildParams index 3684a3f641..8e8ffeb447 100644 --- a/BuildParams +++ b/BuildParams @@ -61,13 +61,12 @@ viewer-release.viewer_channel = "Second Life Release" viewer-release.login_channel = "Second Life Release" viewer-release.build_debug_release_separately = true viewer-release.build_viewer_update_version_manager = true -viewer-release.release-viewer.jira = DRTVWR-13 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-13 +viewer-pre-release.release-viewer.jira = DRTVWR-39 # ======================================= # brad |