summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-04 16:43:26 -0500
committerOz Linden <oz@lindenlab.com>2011-01-04 16:43:26 -0500
commit05810f063dbe0ed87d03ea41c7d8fdc423945c6e (patch)
tree311355a1679ef47fa1951788319e0c521a188edd /.hgtags
parent5e376017858f6534163b0bfb6b385bdd0aeac5d3 (diff)
parente4591a85182133811e327b579c558bb3db80d79e (diff)
merge changes for storm-737
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 1289dfdf24..d7465f4c59 100644
--- a/.hgtags
+++ b/.hgtags
@@ -40,3 +40,5 @@ dbc206fc61d89ff4cfe15aade0bf0c7bc7fee1c9 2.4.0-start
dc6483491b4af559060bccaef8e9045a303212dd 2.4.0-beta1
dc6483491b4af559060bccaef8e9045a303212dd 2.4.0-beta1
3bc1f50a72e117f4d4ad8d555f0c785ea8cc201e 2.4.0-beta1
+25bd6007e3d2fc15db9326ed4b18a24a5969a46a 2.4.0-beta2
+1ed382c6a08ba3850b6ce9061bc551ddece0ea07 2.4.0-release