summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorsimon@lindenlab.com <simon@lindenlab.com>2011-06-21 09:36:31 -0700
committersimon@lindenlab.com <simon@lindenlab.com>2011-06-21 09:36:31 -0700
commitd11cabc4898a7a1995ed7c89d2cdac46dfcf24ec (patch)
tree9f8e5e57d4ed074e148227c56556bcace90e2e3a /.hgtags
parentc0c0a2b9a5f41fc06619330a81c34955a39ddfe2 (diff)
parentede3b577d8cebd5065514bb485e2cbd93dd5b05a (diff)
Merge with latest lindenlab/viewer-development
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 05ef9ce9bc..bff8f1ebeb 100644
--- a/.hgtags
+++ b/.hgtags
@@ -131,3 +131,4 @@ dac76a711da5f1489a01c1fa62ec97d99c25736d 2.6.6-release
0c4d0c24278074f219e5a32e72b449e78301d11b 2.7.1-beta1
9f79a6ed8fdcd2f3dac33ea6b3236eeb278dccfe 2.7.2-start
6a3e7e403bd19e45fdfc2fcc716867af3ab80861 2.7.3-start
+6af10678de4736222b2c3f7e010e984fb5b327de 2.7.4-start