From c64ab46c446dc9c3a563b31d92b9ab3c4d21a1e5 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Wed, 20 Mar 2024 22:23:52 -0700
Subject: [PATCH] update refs for 50.12-r2

---
 CMakeLists.txt     |  4 ++--
 docs/changelog.txt | 18 ++++++++++++++++--
 library/xml        |  2 +-
 scripts            |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a14b92cb43..2d14666b8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,8 +8,8 @@ project(dfhack)
 
 # set up versioning.
 set(DF_VERSION "50.12")
-set(DFHACK_RELEASE "r2rc2")
-set(DFHACK_PRERELEASE TRUE)
+set(DFHACK_RELEASE "r2")
+set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
 set(DFHACK_ABI_VERSION 2)
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 8e83501b4c..1ae5d08c56 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -53,6 +53,22 @@ Template for new versions:
 
 ## New Tools
 
+## New Features
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+## Removed
+
+# 50.12-r2
+
 ## New Features
 - `stocks`: add button/hotkey for removing empty categories from the stocks list
 - `sort`: updated and reinstated military status/squad membership/burrow membership filter for work animal assignment screen
@@ -102,8 +118,6 @@ Template for new versions:
 - ``dfhack.units.isForgottenBeast``: make new units method available to Lua
 - ``dfhack.units.getCitizens``: now includes residents by default
 
-## Removed
-
 # 50.12-r1.1
 
 ## Fixes
diff --git a/library/xml b/library/xml
index dc0d269286..6d08791b98 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit dc0d269286415fe28441992724be67e1072fbe3b
+Subproject commit 6d08791b987deaab6f9006abde4941fb0b836d1d
diff --git a/scripts b/scripts
index 3413b065ce..eb82d42a86 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 3413b065ce993b21fc8a429fa40a5ce506a9db63
+Subproject commit eb82d42a8693969fa054e8982b941da16294e56b