summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-08 16:55:44 -0400
committerOz Linden <oz@lindenlab.com>2012-06-08 16:55:44 -0400
commit19a4a5fc66ac3cfb97185505fa1024145eab6f97 (patch)
tree9f3a0784636e8fbfc9a73d027f4dad78127d39f3
parent32943b1d99a07668ddcb6875cb3cd62ac8341414 (diff)
parent6abcd55b500db0e0cb0fedefeb5583588f20ff8c (diff)
merge changes for tags in viewer-beta repo
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index ade965559f..181c01e046 100644
--- a/.hgtags
+++ b/.hgtags
@@ -303,6 +303,7 @@ c623bbc854b6f7ee1b33a3718f76715046aa2937 viewer-release-candidate
675668bd24d3bea570814f71762a2a806f7e1b8d viewer-release-candidate
c08e2ac17a99973b2a94477659220b99b8847ae2 DRTVWR-163
600f3b3920d94de805ac6dc8bb6def9c069dd360 DRTVWR-162
+600f3b3920d94de805ac6dc8bb6def9c069dd360 DRTVWR-162
9a78ac13f047056f788c4734dd91aebfe30970e3 DRTVWR-157
a716684aa7c07c440b1de5815b8a1f3dd3fd8bfb DRTVWR-159
24a7281bef42bd4430ceb25db8b195449c2c7de3 DRTVWR-153