summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-23 14:29:24 -0400
committerOz Linden <oz@lindenlab.com>2013-04-23 14:29:24 -0400
commitbfb1ab134f7bcb0d2a8cfd73019d8999ae9a504a (patch)
treef67a78cb5950eedbeec8f32dd8e8730a599ee414 /.hgtags
parent82e3efeddc4a80bb81ff734b780a922c5efd500e (diff)
parent0bc7056ae6b314fac508f2c417cc5818107cb72e (diff)
merge changes for 3.5.1-beta3
Diffstat (limited to '.hgtags')
-rwxr-xr-x.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 92a49cc4f5..02df52ceaa 100755
--- a/.hgtags
+++ b/.hgtags
@@ -440,3 +440,5 @@ adc360e6bf21390d2665380951d85937cd29a604 3.5.0-release
9d8726eca785acad694564516f16dd639faf45c0 3.5.1-beta2
78a8fe6abf331944d6b6bb1ce1024a6bc08141f4 DRTVWR-298
50ccc12f38c3c99f03b374e32429cb043b73e2a6 DRTVWR-294
+4b7fa963b80e2056ab648f83a4d61310b3cedb3d DRTVWR-314
+65ae89aeb7ea674a555e439e963f17949322ac94 3.5.1-beta3