summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-14 14:05:14 -0400
committerOz Linden <oz@lindenlab.com>2010-10-14 14:05:14 -0400
commitc322a29752c74c92328ebffeef77faa06e9ca7d9 (patch)
treeeccfa277ed588ad1120f93d78023ed0e3096d9f3
parent8964526beac48fe948689145857f71256a6d8f53 (diff)
parentdb6e22d6520557467d751a1c100ba7597e34424d (diff)
merge old 2.1.1-release head that was lying around
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index b65f500e64..1a26e79e71 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1,3 +1,4 @@
+bb38ff1a763738609e1b3cada6d15fa61e5e84b9 2.1.1-release
003dd9461bfa479049afcc34545ab3431b147c7c v2start
08398e650c222336bb2b6de0cd3bba944aef11b4 2-1rn1
0962101bfa7df0643a6e625786025fe7f8a6dc97 2-1-beta-2