# HG changeset patch # User Tero Marttila # Date 1331149147 -7200 # Node ID 6e83183e242fe9de3183c392bc9cb0fa9d9c6de0 # Parent 278cdecf019101f0ad1da6509e256647eb1480a9# Parent 5e8279dec643cbea814d968a6c8d628fad72b5c3 merge diff -r 5e8279dec643 -r 6e83183e242f .hgtags --- a/.hgtags Wed Mar 07 21:38:19 2012 +0200 +++ b/.hgtags Wed Mar 07 21:39:07 2012 +0200 @@ -1,1 +1,2 @@ df859bfdd3be4c5047b2385b0f31b3d058319f9b 0.1.0-rc1 +35c4c56f1376587a11bd46f5259f030f03e9876e 0.2.0-rc1