merge 0.9.15
authorkoda
Thu, 13 Jan 2011 04:18:31 +0100
branch0.9.15
changeset 4738 9880c256aa1d
parent 4736 b4b44ae480c2 (current diff)
parent 4733 45b5a16c01fb (diff)
child 4740 7cbfa586dd7a
merge
.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