summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-02-15 16:10:21 -0500
committerJonathan Yap <none@none>2011-02-15 16:10:21 -0500
commiteff712570d389d1b7b36153c48b17d906d5eada3 (patch)
treea3eb4a444fcc23a8d79510c4bdd3de04afe6cc9a /.hgtags
parent457683bf51039a1bf9114efe47b9f00e4df842a8 (diff)
parent3555849644ff228a189dd2a21e57def22f142e5d (diff)
STORM-990 Merged from current v-d trying to resolve merge issue Oz was having
Diffstat (limited to '.hgtags')
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 08116f2a25..6eb0813d1b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -69,3 +69,4 @@ b723921b5c711bd24dbe77dc76ef488b544dac78 2.5.0-beta3
b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-34_2.5.0-beta3
b723921b5c711bd24dbe77dc76ef488b544dac78 2.5.0-release
b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release
+92e58e51776a4f8c29069b1a62ff21454d2085f0 2.6.0-start