summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-04-04 09:18:46 -0700
committerGraham Madarasz (Graham Linden) <graham@lindenlab.com>2013-04-04 09:18:46 -0700
commit1741d82a1d1c057009558dc772cdecf5989c4d3f (patch)
tree5578b998fc15b567c88b24c6e86cd538829a5674 /.hgtags
parent1517d061bc51dc6e63ba47283875a72db3c4b588 (diff)
parent98c93a54bf5fa4e0163e9a229aa67458fb063cbb (diff)
Merge with oz-materials (no conflicts)
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 49452fb679..4fa37c7b4e 100644
--- a/.hgtags
+++ b/.hgtags
@@ -433,3 +433,4 @@ fd6b510e83f56830e45670c428653134899d3e25 DRTVWR-305
55339537d99afc394d1bb7fdb7d074bf321ca62f 3.5.0-beta6
902caf2b9fdbdbc5c399c4d5ebcecaf9cb97bab8 DRTVWR-306
5c6098fd17d40ee3a38ca6b64f6be9db7f61f0a8 3.5.0-beta7
+adc360e6bf21390d2665380951d85937cd29a604 3.5.0-release