summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-01-17 12:05:23 -0800
committerRichard Linden <none@none>2012-01-17 12:05:23 -0800
commit37593f276cacb9db7f1f8ed8ff6c1fe1b56ff883 (patch)
tree2ec32a4cf984cde8a003f45b324de328f318c675 /.hgtags
parent944814941d16e7853ff365acc17a16b3a20ac9cb (diff)
parentfacb0fa42cf7dbc4deb3a4026cc216aa0099111e (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index f4ffb61aa6..75dc28b262 100644
--- a/.hgtags
+++ b/.hgtags
@@ -245,3 +245,4 @@ bd6bcde2584491fd9228f1fa51c4575f4e764e19 3.2.4-release
65a2c1c8d855b88edfbea4e16ef2f27e7cff8b1d DRTVWR-107_3.2.5-beta2
65a2c1c8d855b88edfbea4e16ef2f27e7cff8b1d 3.2.5-beta2
2174ed1c7129562428a5cfe8651ed77b8d26ae18 3.2.6-start
+4891c46a56fed7512c783b9cbe7cb7260727bf0c 3.2.7-start