summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-03-26 14:22:54 -0700
committerBrad Linden <brad@lindenlab.com>2024-03-26 14:22:54 -0700
commitcab312d10078d8088e4f9206bc6160980243cd8b (patch)
treea1fe8cc9c9a44cab26837a4aab633880b2bd24a4 /indra/newview
parent2ef42c8c3649898bdc9a2e5a95a5fa34a700daf9 (diff)
parent9567393f803dfb0c786b8e917e41c8f4b8b22af7 (diff)
Merge remote-tracking branch 'origin/main' into release/materials_featurette
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/VIEWER_VERSION.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index b7f8ee41e6..69adf3456f 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-7.1.4
+7.1.5