Merge branch 'svn-trunk'

2026-05-17 10:41:26 +00:00 · 2019-12-03 20:19:36 -08:00
parent e8160b2531 ab9edab2d6
commit 62d1fbc579
1 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@@ -25,3 +25,5 @@ SRPT 1.0.0				450
 3.2.0					7058 on the 3.2.x branch
 3.3.x branch start			7225, which is a copy of trunk r7224
 3.3.0					7830 on the 3.3.x branch
+3.4.x branch start                      8675, which is a copy of trunk r8674
+3.4.0					8674 on the trunk