summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-10-13 17:08:00 -0400
committerLoren Shih <seraph@lindenlab.com>2010-10-13 17:08:00 -0400
commitded6a78541d9f779b5cbef0d1255588b93d5dce6 (patch)
treef343cacbfd01888c604b891ceb877b429f50641c /.hgtags
parentfa20a3fe100bd2c99b6fe4c087c79268752a107c (diff)
parentc7c43d83f80dcac8be79cc76c9d9bbf8ff4c8354 (diff)
Automated merge up from viewer-development
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index f761bdc158..162c25cd1d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -24,3 +24,5 @@ d40ac9dd949cba6dab1cc386da6a2027690c2519 alpha-5
d6781e22543acd7e21b967209f3c6e7003d380e3 fork to viewer-2-0
c6e6324f5be1401f077ad18a4a0f6b46451c2f7b last_sprint
7076e22f9f43f479a4ea75eac447a36364bead5a beta_2.1.3
+7076e22f9f43f479a4ea75eac447a36364bead5a 2.2.0-beta1
+9822eb3e25f7fe0c28ffd8aba45c507caa383cbc 2.2.0-beta2