summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-12-18 12:21:32 -0800
committerBrad Linden <brad@lindenlab.com>2024-12-18 12:21:32 -0800
commit8ed31a73d3e92517ffec04ca61c12ec6a2e81742 (patch)
tree79f8ff1c5845b9cf1e70f0d6d21236f0b9a8e867
parent7aca014ebc8c51aa07109eaf7dc77cbfee81c742 (diff)
parent5029f0322f264e17f7509952f7bf9812db17a9ec (diff)
Merge remote-tracking branch 'origin/main' into release/2024.12-ForeverFPS
-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 e0eaaa0bbc..0f9f025fe4 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-7.1.11
+7.1.12