summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-07 14:11:36 -0400
committerOz Linden <oz@lindenlab.com>2011-07-07 14:11:36 -0400
commit24859f3ed41c8bd01e433d89422fe6dd5f5d3b0d (patch)
treed750a9bdf8fc8adc11649d774b45585f78d6479d
parent5d92dc44026f7dd237aa871593080fd151064e62 (diff)
parent9928016ad9069dc8839ff44128bd99bcefd21f4b (diff)
pull tags for 2.7.4
-rw-r--r--.hgtags2
-rw-r--r--BuildParams3
2 files changed, 3 insertions, 2 deletions
diff --git a/.hgtags b/.hgtags
index e33205b15d..ba120eb2dd 100644
--- a/.hgtags
+++ b/.hgtags
@@ -136,3 +136,5 @@ e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb DRTVWR-63_2.7.2-beta1
e0dc8b741eaa27dcdfbc9e956bb2579b954d15eb 2.7.2-beta1
6a3e7e403bd19e45fdfc2fcc716867af3ab80861 2.7.3-start
6af10678de4736222b2c3f7e010e984fb5b327de 2.7.4-start
+be963a4eef635542f9617d7f5fd22ba48fb71958 DRTVWR-67_2.7.4-beta1
+be963a4eef635542f9617d7f5fd22ba48fb71958 2.7.4-beta1
diff --git a/BuildParams b/BuildParams
index f34b262913..2e0e74ab70 100644
--- a/BuildParams
+++ b/BuildParams
@@ -69,8 +69,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-13
-viewer-pre-release.release-viewer.jira = DRTVWR-46
+#viewer-pre-release.release-viewer.jira = DRTVWR-46
# =======================================