summaryrefslogtreecommitdiff
path: root/BuildParams
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-31 16:40:57 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-31 16:40:57 -0400
commit8ccf3fbe3ba49c47da85527bcf6cdbded6fa9183 (patch)
treeedddbe8910b253d803d754ef0a87c95b74ba3adc /BuildParams
parent3a08499572250b46d061106298e2d2777276efc1 (diff)
parent5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'BuildParams')
-rwxr-xr-xBuildParams3
1 files changed, 1 insertions, 2 deletions
diff --git a/BuildParams b/BuildParams
index 7011875626..ddb9294067 100755
--- 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