summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-24 09:07:06 -0500
committerOz Linden <oz@lindenlab.com>2010-12-24 09:07:06 -0500
commitef1c3aac889d118530994e878d83426d4fc2ca7c (patch)
treedd3d1240a8f5e9b7f1a60d7447b9aa3d624ada88 /.hgtags
parentf421e8701b3ef5b0230b06602fc5e937382ccc68 (diff)
parent14d830ca43a7114140ebeb16a76829db4d21a95b (diff)
merge fix for storm-784
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