summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-31 16:26:09 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-31 16:26:09 -0400
commit09179d1346ccf2fa07b2dec6a72592beb3bd262f (patch)
tree86b28bc6c0322a9abe9721dd0a0aa6e104487926 /.hgtags
parent0f9dc968cfb702eba595213bbecd34375bd048c5 (diff)
parentf18cfe97750cc13374adab15636532fe0fbda19c (diff)
merge viewer-development to mesh-development
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags4
1 files changed, 4 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index f39eadae1b..b9cf8d6db2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -207,3 +207,7 @@ bc01ee26fd0f1866e266429e85f76340523e91f1 3.1.0-beta2
ae2de7b0b33c03dc5bdf3a7bfa54463b512221b2 DRTVWR-92_3.1.0-release
ae2de7b0b33c03dc5bdf3a7bfa54463b512221b2 3.1.0-release
a8230590e28e4f30f5105549e0e43211d9d55711 3.2.0-start
+e440cd1dfbd128d7d5467019e497f7f803640ad6 DRTVWR-95_3.2.0-beta1
+e440cd1dfbd128d7d5467019e497f7f803640ad6 3.2.0-beta1
+9bcc2b7176634254e501e3fb4c5b56c1f637852e DRTVWR-97_3.2.0-beta2
+9bcc2b7176634254e501e3fb4c5b56c1f637852e 3.2.0-beta2