summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-11-19 14:53:28 -0500
committerOz Linden <oz@lindenlab.com>2012-11-19 14:53:28 -0500
commitb2f81f7900541607e2c7bf30f072978b8b8f31e1 (patch)
tree36c1a810dc4507c7075b8dc6dade7e3550ade0d3
parentcca22d608deb26cf21b33629b170e70a0e221575 (diff)
parentd56a98dea4c7523a759bea4740d8bdde1df15e30 (diff)
merge tag for 3.4.2-release
-rwxr-xr-x.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 2c0b357f2d..db112186c2 100755
--- a/.hgtags
+++ b/.hgtags
@@ -358,6 +358,7 @@ f7bedce18ad52283e6072814db23318907261487 DRTVWR-238
7b64c96fbcadf360bd2feaae19d330166b70877c DRTVWR-210
e9a5886052433d5db9e504ffaca10890f9932979 DRTVWR-243
73b84b9864dc650fe7c8fc9f52361450f0849004 3.4.2-beta4
+16310aabccf315870f7cc9bf966926c0ad6954fa 3.4.2-release
5e4e4128b256525bafc07a62e35ae8527aaa9c9d DRTVWR-241
f1d3b3fcab28ed9ea532bf50db0ba96f5c8cc8e9 DRTVWR-232
4918b150e75df6b516fb6c2616d32043fa6b4cac DRTVWR-245