# HG changeset patch # User Matti Hamalainen # Date 1303315215 -10800 # Node ID 9fcb55bc13664506d0dd42193685ad711ecc11d8 # Parent ffe9051c9b474a2496c53e4f7134a0addc3c2196# Parent fce4e2e31d693dd29c1013b2d1326ebd86259f94 Automated merge with file:///hg/nnchat diff -r fce4e2e31d69 -r 9fcb55bc1366 .hgtags --- 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 diff -r fce4e2e31d69 -r 9fcb55bc1366 VERSION --- 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