summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2010-12-17 15:54:00 -0500
committerMonty Brandenberg <monty@lindenlab.com>2010-12-17 15:54:00 -0500
commitdb11a76d519ebb076ec0b72284993d7f6c15f383 (patch)
tree2fa7986e0e0ba9a39b2d2d3722ce1769ce6c2684 /.hgtags
parent3c05ebd28635e867f9726062b08cdbf4a7b53b22 (diff)
parentfb8ba15801f0620699fecdf2ed08668df0be7210 (diff)
Merge from viewer-development post 2.4 release
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