# HG changeset patch # User Ivan Damnjanovic lnx # Date 1315401450 -3600 # Node ID 4205744092e6a16951e48acef27fb41e32851758 # Parent af5abc34a5e1cf7b8905df228ec47cfcb177a266# Parent 855025f4c779c6b89c3d0b98290bb6949cd62b03 Merge from branch "ivand_dev" diff -r 855025f4c779 -r 4205744092e6 .hgtags --- a/.hgtags Wed Sep 07 14:16:50 2011 +0100 +++ b/.hgtags Wed Sep 07 14:17:30 2011 +0100 @@ -3,3 +3,4 @@ 9ff69e8e049f936804d0e5876cd4d367be9f3c4a backup 14032011 b14e1f6ee4bea90a8a894a52c1114a72aa818071 ver_1.1 19e0af5709140e163faaf9d8cf4b83a664be1edc release_1.5 +30872eb3d1606b89f8d071cfdb7cddb874fab8fd release_1.51