summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-12-13 09:51:15 -0800
committerDessie Linden <dessie@lindenlab.com>2010-12-13 09:51:15 -0800
commitaa212430857e59e317d65b61748365a2fc4eb0ba (patch)
tree6182db431b188b8d1ad9787ee74f28afbd2f7378
parente27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff)
parentdbd06789e6c91f6d9a42e5aafa98996ada915c21 (diff)
Merge from viewer-beta
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 1289dfdf24..44e822aae4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -40,3 +40,4 @@ 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