summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-09-19 13:53:33 -0400
committerOz Linden <oz@lindenlab.com>2012-09-19 13:53:33 -0400
commit6c3ccf5d4e85307d43b4e7251e0693665ebd6fe9 (patch)
tree557ed97aacf4a4168a13a9d427389749345304eb
parentf44bde8a8f0f11577543a4b1122d63854adcb3f4 (diff)
parent075e55c4589b16dd5089075f14f5257654438264 (diff)
pull back beta7 hotfix merge and new 3.4.0-release tag
-rw-r--r--.hgtags2
1 files changed, 1 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index 420ec1a3d3..57b7e27699 100644
--- a/.hgtags
+++ b/.hgtags
@@ -304,7 +304,7 @@ b1dbb1a83f48f93f6f878cff9e52d2cb635e145c 3.4.0-beta2
af7b28e75bd5a629cd9e0dc46fb3f1757626f493 DRTVWR-212
015012c2b740ccdec8a8c3d6e5f898449ecfe0b8 DRTVWR-213
62b07aa81b1957897c3846292bb9412977b0af6c 3.3.4-beta6
-d02759655d6b36d60f4a927e4bfce82844a82ef5 3.4.0-release
baa627938dbb7956f45e1eebef11ffe9e7f2e5bc 3.4.1-beta1
ceed0b65a69f1eac20d523e0203320a32f9a3f3c DRTVWR-215
733ceac77583874f3626ef7a15c105b83ef0f5bb 3.4.0-beta7
+97977c67245f52db20eb15f1918cc0f24778cabc 3.4.0-release