summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-21 15:55:55 -0500
committerOz Linden <oz@lindenlab.com>2011-01-21 15:55:55 -0500
commitd034d8d9289a9e5511d32ec048b75837b89264ad (patch)
treec3fd25eb7d1096baef0290b5bf86321f7ed447ad /.hgtags
parent6150e4ed7cf86a2afc0061ba89b0cb049d6f036e (diff)
parent97a9211d87fac90994846e5bf91a78a708ec5a9c (diff)
merge changes for vwr-24347
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags9
1 files changed, 9 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index d7465f4c59..0e0898afb0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -42,3 +42,12 @@ 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
+76f586a8e22b1abe6b2339758c8ac0fa718975de 76f586a8e22b
+76f586a8e22b1abe6b2339758c8ac0fa718975de 76f586a8e22b
+0000000000000000000000000000000000000000 76f586a8e22b
+0000000000000000000000000000000000000000 76f586a8e22b
+345b17e7cf630db77e840b4fe3451bd476d750a3 76f586a8e22b
+345b17e7cf630db77e840b4fe3451bd476d750a3 2.5.0-beta1
+345b17e7cf630db77e840b4fe3451bd476d750a3 76f586a8e22b
+0000000000000000000000000000000000000000 76f586a8e22b