changeset 253:993fd8eb4271

Automated merge with file:///hg/nnchat
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 24 Apr 2011 23:35:07 +0300
parents 380a12286e33 (diff) dcf78e2c458c (current diff)
children 269135d58acd
files
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sun Apr 24 23:35:00 2011 +0300
+++ b/.hgtags	Sun Apr 24 23:35:07 2011 +0300
@@ -1,2 +1,6 @@
 cbb9db83ef18f37ddd0a1b25d3f6aa6096a0c29d dev-0_8_9
 f92f0322cbf3ca835af16ccedb47ca2188ed311f dev-0_8_11
+f92f0322cbf3ca835af16ccedb47ca2188ed311f dev-0_8_11
+0000000000000000000000000000000000000000 dev-0_8_11
+0000000000000000000000000000000000000000 dev-0_8_11
+a997631876807281de3d8d6860eb722ba0ca14a9 dev-0_8_11