# HG changeset patch # User koda # Date 1294888711 -3600 # Node ID 9880c256aa1d3bca9cc8154b4dc845b428b41f7d # Parent b4b44ae480c2b8103989b68bfa845af0ce1a265d# Parent 45b5a16c01fb540059b1643e4347bf04ad55a6a4 merge diff -r b4b44ae480c2 -r 9880c256aa1d .hgtags --- a/.hgtags Thu Jan 13 04:17:51 2011 +0100 +++ b/.hgtags Thu Jan 13 04:18:31 2011 +0100 @@ -24,4 +24,4 @@ adffb668f06e265b45d1e4aedc283e6f4e5ba7e8 Hedgewars-iOS-1.1 ede569bb76f389bd5dfbb7ebf68af3087e3e881c Hedgewars-iOS-1.2 a5735e877aae61cd705265e2f8c0c7ad08d45f0e Hedgewars-iOS-1.2.1 -29ab0d49c3e6e72a7633d0bd316ae533db15c65d 0.9.15 +bd74fd83929a09251d1ede09e6c03a641a0ee35f 0.9.15