summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2012-02-06 14:48:09 -0500
committerDebi King (Dessie) <dessie@lindenlab.com>2012-02-06 14:48:09 -0500
commitd0da897b24c41983db5a848eced8e71520d85a1b (patch)
tree73aa722984f7591f2c00fc6de5f9c8621aba700d
parent836e5e56ee1d726f8047b1b3277281ba6ca93516 (diff)
parenta3a69b1eb1fd7c346b97b0c3feca6151684fdced (diff)
tag merge back from viewer-beta
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 8442f3ce89..8b381a88a5 100644
--- a/.hgtags
+++ b/.hgtags
@@ -259,5 +259,7 @@ c6175c955a19e9b9353d242889ec1779b5762522 3.2.5-release
3d75c836d178c7c7e788f256afe195f6cab764a2 DRTVWR-111_3.2.7-beta1
3d75c836d178c7c7e788f256afe195f6cab764a2 3.2.7-beta1
89980333c99dbaf1787fe20784f1d8849e9b5d4f 3.2.8-start
+16f8e2915f3f2e4d732fb3125daf229cb0fd1875 DRTVWR-114_3.2.8-beta1
+16f8e2915f3f2e4d732fb3125daf229cb0fd1875 3.2.8-beta1
987425b1acf4752379b2e1eb20944b4b35d67a85 DRTVWR-115_3.2.8-beta2
987425b1acf4752379b2e1eb20944b4b35d67a85 3.2.8-beta2