summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-08-31 12:58:41 -0400
committerOz Linden <oz@lindenlab.com>2010-08-31 12:58:41 -0400
commit049f0e1f9569ce47cc4563dcd60a0cf6fd27ed8e (patch)
treedc1a8a68fb71dca01bd3b728d7002c32b6ad554b
parent93b2f1a03926c64676c4ead61ea8cc46bfe1cb87 (diff)
parent4d3cb398dbc9225a46c8a96b706be6f056964c17 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index d3172eb75a..8b1b58bc5e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -22,3 +22,4 @@ c6969fe44e58c542bfc6f1bd6c0be2fa860929ac 2-1-beta-4
d2382d374139850efa5bb6adfb229e3e656cfc40 howard-demo
d40ac9dd949cba6dab1cc386da6a2027690c2519 alpha-5
d6781e22543acd7e21b967209f3c6e7003d380e3 fork to viewer-2-0
+c6e6324f5be1401f077ad18a4a0f6b46451c2f7b last_sprint