summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-06 11:40:10 -0400
committerOz Linden <oz@lindenlab.com>2011-06-06 11:40:10 -0400
commit336d3c15c426f1f29b85ed67d8fe5db93c2cc148 (patch)
tree0904f442600a14d0569668663df61ecf7ac067a8 /.hgtags
parentbbc1283848e01bfd5284293d044eec53cde10d0e (diff)
parent7a7c6860e523a53285acda408d7798ffcd892778 (diff)
merge changes for viewer-development
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 61f5a3b735..a73a853914 100644
--- a/.hgtags
+++ b/.hgtags
@@ -140,3 +140,4 @@ dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release
8f2da1701c81a62352df2b8d413d27fb2cade9a6 2.6.3-release
43c7ee846b7eed80786acbbf35d03bd016a3e85d DRTVWR-59_2.7.0-beta1
43c7ee846b7eed80786acbbf35d03bd016a3e85d 2.7.0-beta1
+9f79a6ed8fdcd2f3dac33ea6b3236eeb278dccfe 2.7.2-start