summaryrefslogtreecommitdiff
path: root/.hgtags
diff options
context:
space:
mode:
authorsimon <none@none>2013-08-05 12:03:00 -0700
committersimon <none@none>2013-08-05 12:03:00 -0700
commitb50f54db591dfe6cb5304b6b29d50c2066c69747 (patch)
treeaa365f653e3273b2d765bd689a9182b960dff376 /.hgtags
parent570884d73007aea2438f3faa1181129a16bad359 (diff)
parent32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff)
Merge viewer-release with Vivox code
Diffstat (limited to '.hgtags')
-rwxr-xr-x.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index bb4814642e..00dbda157d 100755
--- a/.hgtags
+++ b/.hgtags
@@ -464,3 +464,4 @@ fb1630153bac5552046ea914af3f14deabc1def8 3.6.0-materials-beta1
69429d81ae4dd321eda2607901ef0a0fde71b54c 3.6.0-release
0a56f33ad6aa112032b14a41dad759ad377bdde9 3.6.0-release
75cf8e855ae1af6895a35da475314c2b5acf1850 3.6.1-release
+f6741d5fe8d632651424484df0fe0cb4a01e9fbe 3.6.2-release