summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-23 19:34:15 -0700
committerRichard Linden <none@none>2011-03-23 19:34:15 -0700
commitfdf63ba0753fcfc17aa6939836c7835787293b3c (patch)
treecd2bbbad8c1bd8b901a755b81f9cbb78f0bdee43 /.hgtags
parent501e282ee03e6d53c16c421d8b49f8bed3e74ef3 (diff)
parent9c82ea334ab0c1283f28997fe060b24200e3e2be (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 5eed83f2ca..8d5f290ff6 100644
--- a/.hgtags
+++ b/.hgtags
@@ -77,3 +77,5 @@ b53a0576eec80614d7767ed72b40ed67aeff27c9 DRTVWR-38_2.5.2-release
b53a0576eec80614d7767ed72b40ed67aeff27c9 2.5.2-release
92e58e51776a4f8c29069b1a62ff21454d2085f0 2.6.0-start
f1827b441e05bf37c68e2c15ebc6d09e9b03f527 2.6.0-start
+f1827b441e05bf37c68e2c15ebc6d09e9b03f527 2.6.0-start
+4e9eec6a347f89b2b3f295beb72f1cf7837dff66 2.6.0-start