summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-12-16 13:51:52 -0500
committerNat Goodspeed <nat@lindenlab.com>2018-12-16 13:51:52 -0500
commit11f23ca436d65c4a896be8718b2fb5dae1e5c314 (patch)
tree2495ddf1fd00e936861d5ae18b3da4aeea862605 /.hgtags
parent4a136572857fcf5d5fd21789a777bbde67c1076d (diff)
parentf5f504b0f946582efc85b0e76f38e9242aed11bb (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-bugsplat
Diffstat (limited to '.hgtags')
-rwxr-xr-x.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 0ef2e913ac..b117cb3016 100755
--- a/.hgtags
+++ b/.hgtags
@@ -543,3 +543,4 @@ ac3b1332ad4f55b7182a8cbcc1254535a0069f75 5.1.7-release
52422540bfe54b71155aa455360bee6e3ef1fd96 5.1.9-release
1cfa567caf5088ae299271be08cc2d9f0801ff6a pre-Poseidon
821edfcd14919c0e95c590866171c61fb57e8623 6.0.0-release
+21b7604680ef6b6ea67f8bebaaa588d6e263bdc1 6.0.1-release