summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-07-13 02:09:57 +0000
committerDon Kjer <don@lindenlab.com>2012-07-13 02:09:57 +0000
commit3c9c7036fed46555787ad0dd545f1d8fa180ebb0 (patch)
tree10344b99b079cba54905a1980ec8ba4e6c5dca9c /.hgtags
parentf0e34ebcd61ee998efa681a211545a7335d60c97 (diff)
parent254c2703632ef5d7a875597d4907804c63ed8e72 (diff)
Merge lindenlab/viewer-development => don_linden/viewer-horde-fixes
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags3
1 files changed, 3 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index f56e20f990..de2e5fb096 100644
--- a/.hgtags
+++ b/.hgtags
@@ -150,6 +150,7 @@ a9abb9633a266c8d2fe62411cfd1c86d32da72bf 2.7.1-release
09984bfa6cae17e0f72d02b75c1b7393c65eecfc 2.7.5-beta1
e1ed60913230dd64269a7f7fc52cbc6004f6d52c 2.8.0-start
502f6a5deca9365ddae57db4f1e30172668e171e 2.8.1-start
+888768f162d2c0a8de1dcc5fb9a08bd8bd120a6b DRTVWR-175
2a3965b3ad202df7ea25d2be689291bb14a1280e DRTVWR-155
6866d9df6efbd441c66451debd376d21211de39c DRTVWR-68_2.7.5-release
6866d9df6efbd441c66451debd376d21211de39c 2.7.5-release
@@ -337,3 +338,5 @@ cbea6356ce9cb0c313b6777f10c5c14783264fcc DRTVWR-174
bce218b2b45b730b22cc51e4807aa8b571cadef3 DRTVWR-173
f91d003091a61937a044652c4c674447f7dcbb7a 3.3.4-beta1
82b5330bc8b17d0d4b598832e9c5a92e90075682 3.3.4-beta2
+eb539c65e6ee26eea2bf373af2d0f4b52dc91289 DRTVWR-177
+a8057e1b9a1246b434a27405be35e030f7d28b0c 3.3.4-beta3