summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-03-23 22:39:18 -0400
committerOz Linden <oz@lindenlab.com>2015-03-23 22:39:18 -0400
commitd6f7a16a686a32a3369661b8db35860e7cae6e8f (patch)
tree07b0117b098fef20dd9ddc597e4c0599c4235a4d /.hgtags
parent7ba82a6409e4fc096407f0247b084950d1e3c14a (diff)
parentc489f1f8647a77c8c7d5fb5b721433dd72cb49c8 (diff)
merge changes for 3.7.26-release
Diffstat (limited to '.hgtags')
-rwxr-xr-x.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 81248f02a7..e73ba6a156 100755
--- a/.hgtags
+++ b/.hgtags
@@ -497,3 +497,5 @@ bcc2770e21c125e0bab59141c51db9145aec068d 3.7.17-release
bc61801f614022c920cb5c3df1d7d67a9561ce1f 3.7.22-release
3be800e1afad9615442159e388d6d137be7b951e 3.7.23-release
d3d0101e980ec95043e0af9b7903045d3bc447e4 3.7.24-release
+9978a8c3a2ffce4a5e1c186256581c2ac139c9dc 3.7.25-release
+000e9dda4162cbf0a83ba88558b19473654a09a9 3.7.26-release