summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNyx Linden <nyx@lindenlab.com>2013-04-23 11:29:51 -0400
committerNyx Linden <nyx@lindenlab.com>2013-04-23 11:29:51 -0400
commit97fe351d6b7066a1629e8afaac340417aaeec395 (patch)
tree24a5d8f99cdbf12e2c5e03dc6d95b637e5e47716
parent06d7845a5a40e012ad1bc7cc4ec15e82c00e5da4 (diff)
parentc8e8ef8517efa174df8b4a3085548f2a658be21b (diff)
merging in tags from beta 2
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 53693c2cdf..ed123d3440 100644
--- a/.hgtags
+++ b/.hgtags
@@ -438,3 +438,5 @@ adc360e6bf21390d2665380951d85937cd29a604 3.5.0-release
1ada73295ed0eaa4a772ef079c29f57069342c32 DRTVWR-310
0ca3910763cec967703e45bc6208a325dccb9f95 3.5.1-beta1
20cdf370f5c8be6193bef6fb3a81cc3f81275191 3.5.1-beta1
+2319904200de367646b9a9442239a38d52c1eeb5 DRTVWR-313
+9d8726eca785acad694564516f16dd639faf45c0 3.5.1-beta2