merge 0.9.15
authorkoda
Thu, 13 Jan 2011 04:17:19 +0100
branch0.9.15
changeset 4734 55625e76c232
parent 4730 bd74fd83929a (current diff)
parent 4727 e51393a45ffc (diff)
child 4736 b4b44ae480c2
merge
--- a/.hgtags	Tue Dec 28 10:31:48 2010 +0100
+++ b/.hgtags	Thu Jan 13 04:17:19 2011 +0100
@@ -24,3 +24,4 @@
 adffb668f06e265b45d1e4aedc283e6f4e5ba7e8 Hedgewars-iOS-1.1
 ede569bb76f389bd5dfbb7ebf68af3087e3e881c Hedgewars-iOS-1.2
 a5735e877aae61cd705265e2f8c0c7ad08d45f0e Hedgewars-iOS-1.2.1
+29ab0d49c3e6e72a7633d0bd316ae533db15c65d 0.9.15