summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-03 15:11:28 -0400
committerOz Linden <oz@lindenlab.com>2013-04-03 15:11:28 -0400
commit00390ccbd77579dac0a1eaa8e83e7b89ce701a35 (patch)
tree9193268a0ab3f1cc36a0791787591ed8146e2e84
parent90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (diff)
parent8a330ee2eb1008951f5e5159057fa5736dd805b4 (diff)
merge changes for 3.5.0-release
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 3e4bb9be2e..e7b221d0cb 100644
--- a/.hgtags
+++ b/.hgtags
@@ -433,3 +433,4 @@ fd6b510e83f56830e45670c428653134899d3e25 DRTVWR-305
55339537d99afc394d1bb7fdb7d074bf321ca62f 3.5.0-beta6
902caf2b9fdbdbc5c399c4d5ebcecaf9cb97bab8 DRTVWR-306
5c6098fd17d40ee3a38ca6b64f6be9db7f61f0a8 3.5.0-beta7
+adc360e6bf21390d2665380951d85937cd29a604 3.5.0-release