summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-05-14 15:12:46 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-05-14 15:12:46 -0400
commit917e7317c0862fcb2024eefc3a526af5b5aa4071 (patch)
tree4f40e07d99c4ca894b6283aea677ac2ace73dc79 /.hgtags
parent8a83408185ab3aa8d05f2e13b6b8592329d4651a (diff)
parentf111b5b1135ee31434acb81d5a3e63e4812e257f (diff)
Merge. Refresh from viewer-cat after it pulled viewer-beta.
Diffstat (limited to '.hgtags')
-rwxr-xr-x.hgtags3
1 files changed, 3 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 11d0481e3a..ebe3dbeacf 100755
--- a/.hgtags
+++ b/.hgtags
@@ -453,3 +453,6 @@ e6b8a92acffd693cd1459e4212e3dff1050acf67 DRTVWR-278
cfc3e650e5b2063288e7b832e9c9f521bbdacc92 DRTVWR-315
e6e35501f1fea252ef83080adcf30c3cb7c2f75c DRTVWR-299
b6a4ac8f1916ede76e8a023e1cf35c045d0ac707 3.5.2-beta3
+a314f1c94374ab1f6633dd2983f7090a68663eb2 3.5.2-beta4
+1cfa86d604909dfdb8b372069ff61f9afaa2aac1 MAINT-2647
+895628bb5e162410cfdf4bca58f0a57d22ccfcde 3.5.2-beta5