summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-04-24 11:36:12 -0400
committerOz Linden <oz@lindenlab.com>2012-04-24 11:36:12 -0400
commit9b87cfbc9182d7ae059734e1d70c089dc1d304b8 (patch)
treec4450dbc9a3e183448973aa538a044f461620400
parent19e0cc93a8af661dbac47552474a704ade600c74 (diff)
parentd6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff)
merge back tags for 3.3.1-release
-rw-r--r--.hgtags3
1 files changed, 3 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index a1057005f9..f0cd9f0736 100644
--- a/.hgtags
+++ b/.hgtags
@@ -289,3 +289,6 @@ b43cd25be49e3984ff5361cefad020e069131d98 3.3.1-start
1dc545e44617975da2a4a32fe303386c687a6ca1 viewer-beta-candidate
1dc545e44617975da2a4a32fe303386c687a6ca1 3.3.1-beta2
1dc545e44617975da2a4a32fe303386c687a6ca1 DRTVWR-139
+5e8d2662f38a66eca6c591295f5880d47afc73f7 viewer-release-candidate
+c623bbc854b6f7ee1b33a3718f76715046aa2937 viewer-release-candidate
+c623bbc854b6f7ee1b33a3718f76715046aa2937 3.3.1-release