summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-10-29 13:17:26 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-10-29 13:17:26 -0700
commitfe0d21689569de9d38413f8fbcc459b8ded50cf6 (patch)
tree6a82bfe8021385f527751abcd419360ba55bb3fa
parentebc8cdd6cbd8207a54314c71fd6abc6e8a49893b (diff)
parent8297c278ac23917ee543419a492c3629dcfb7527 (diff)
Merge
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 98a86a07ad..c2bd497ce0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -31,3 +31,4 @@ b0cd7e150009809a0b5b0a9d5785cd4bb230413a 2.2.0-beta3
00a831292231faad7e44c69f76cb96f175b8dfad 2.2.0-beta4
1415e6538d54fd5d568ee88343424d57c6803c2c 2.2.0-release
98e0d6df638429fd2f0476667504bd5a6b298def 2.3.0-start
+a3c12342b1af0951b8aa3b828aacef17fcea8178 2.3.0-beta1