summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-07 16:44:38 -0500
committerOz Linden <oz@lindenlab.com>2011-01-07 16:44:38 -0500
commit8a939212f4afef41c83cc35a14d7f2c2ee3ce6ba (patch)
tree5df698253963026fe43bb19f69507d4528c539dd /.hgtags
parent346082965ac922a90f7c24bd97be807906b6a35f (diff)
parentc132d20a7433e2d09e3521a15497f661fcbd18b8 (diff)
merge changes for storm-826
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index d7465f4c59..a700aa94ea 100644
--- a/.hgtags
+++ b/.hgtags
@@ -42,3 +42,4 @@ dc6483491b4af559060bccaef8e9045a303212dd 2.4.0-beta1
3bc1f50a72e117f4d4ad8d555f0c785ea8cc201e 2.4.0-beta1
25bd6007e3d2fc15db9326ed4b18a24a5969a46a 2.4.0-beta2
1ed382c6a08ba3850b6ce9061bc551ddece0ea07 2.4.0-release
+a82e5b1e22c7f90e3c7977d146b80588f004ed0d 2.5.0-start