changeset 248:9fcb55bc1366

Automated merge with file:///hg/nnchat
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 20 Apr 2011 19:00:15 +0300
parents ffe9051c9b47 (diff) fce4e2e31d69 (current diff)
children 51319822ae92
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Apr 20 18:59:42 2011 +0300
+++ b/.hgtags	Wed Apr 20 19:00:15 2011 +0300
@@ -1,1 +1,2 @@
 cbb9db83ef18f37ddd0a1b25d3f6aa6096a0c29d dev-0_8_9
+f92f0322cbf3ca835af16ccedb47ca2188ed311f dev-0_8_11
--- a/VERSION	Wed Apr 20 18:59:42 2011 +0300
+++ b/VERSION	Wed Apr 20 19:00:15 2011 +0300
@@ -1,1 +1,1 @@
-0.8.10
+0.8.11