summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-09-05 18:23:31 +0000
committerDon Kjer <don@lindenlab.com>2012-09-05 18:23:31 +0000
commit9f6c8459021f284011a89410a44b62f0e108352c (patch)
tree00f3ef34008c4d10ae5fdb229192731b94a059ad /.hgtags
parent825cc7873251ad90720ab40221d689abed7b2ac8 (diff)
parente3b4b3875a6d8c7857ba948a662ace4731913ecf (diff)
Merge viewer-development -> VirLinden/sunshine
Diffstat (limited to '.hgtags')
-rwxr-xr-x.hgtags4
1 files changed, 4 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index f65942e3cf..c5b40e9b9a 100755
--- a/.hgtags
+++ b/.hgtags
@@ -305,5 +305,9 @@ b1dbb1a83f48f93f6f878cff9e52d2cb635e145c 3.4.0-beta2
7649a3dff5ec22d3727377e5f02efd0f421e4cb5 DRTVWR-201
84fb70dfe3444e75a44fb4bee43e2fc8221cebdd 3.4.0-beta4
de3be913f68813a9bac7d1c671fef96d1159bcd6 DRTVWR-202
+573e863be2f26d3687161def4b9fea9b7038dda8 3.4.0-beta5
34dbbe2b00afe90352d3acf8290eb10ab90d1c8b oz-build-test-tag
6ee71714935ffcd159db3d4f5800c1929aac54e1 DRTVWR-205
+7b22c612fc756e0ea63b10b163e81d107f85dbf8 DRTVWR-206
+8c9085066c78ed5f6c9379dc054c82a6fcdb1851 DRTVWR-207
+351eea5f9dc192fc5ddea3b02958de97677a0a12 3.3.4-release3