From 4a6f243e86fd7833a1b6677ab764e2511b6dbf4a Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 19 Nov 2007 10:58:47 +0000 Subject: Merged revisions 3739,3743-3744,3746-3747 via svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3739 | umperio | 2007-11-16 11:49:58 +0100 (Fri, 16 Nov 2007) | 1 line Removed useless win32 implementation of gettimeofday. ........ r3743 | umperio | 2007-11-16 15:14:00 +0100 (Fri, 16 Nov 2007) | 1 line Fixed minor issues. ........ r3747 | b_lindeijer | 2007-11-18 23:05:16 +0100 (Sun, 18 Nov 2007) | 2 lines Fixed small mapping error, collision layer not changed. ........ --- maps/new_10-1.tmx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps') diff --git a/maps/new_10-1.tmx b/maps/new_10-1.tmx index e0f27520..59bff501 100644 --- a/maps/new_10-1.tmx +++ b/maps/new_10-1.tmx @@ -11,7 +11,7 @@ - H4sIAAAAAAAAAO3dMXPaMBiAYV+6ZuplSTK1QydaOpRcptb//1cVX+Hq42ydDCaSPz3Dc2TIIOW1FWNAPHRd9wAAAAAAAAAAAAAAALAxuwrGAJTzvYIx8LEeT4/n9X84Bp4qGFdUL5V5vWg/PD5XMK45nxcq3Xsrdt2213/9Yzh3+zOh9Niiulz/S/fvjz5NKD027u99pr3+bdC/bS31f65gDDUZrvH6mfYR+/Nfqrv+saXWfP2X+1bBGJboM9rrH1Puua9/2tbOef3RH/3bpn97xq/p9Znt9Y9hSW/9Y1my1usfT6r/j6P9yE/9w0n1f+v+vffj18nw8+UxUHr85NmNOo7l9B/rO/23aO6zRKn+vy/aT/1u6XlxW/9+pv34GEg9Lyw9L27rP3VN5/o/nmvWf/3j0L9tc/2nntPpH09qL4HhGJi7v6N/DDl7SVzzv6D0vLi9//l9SvrH5fxvm/5ty+nfL2zfYv99BWO4xuHk2vvA+scw1f+We0Cl54P+Ed3rsyNrvw5U+u/EOv2vPQZKz4f1+g9S7/XTf/uW7Cm8z1B6Ptyvf4q9/LbJnuJtOySUHhsAAETgmrttNezhjv7oT5n+7pW3q6bzf6t7km5ZTf1ZX+r53UF/AAAAaFYr9+F87zsAQCzD96W/ZHqqYLys68vR10ylx0q9cteQtb1WMHcAiOKx838WAAAAAAAAAAAiSX1WoPTYAACAj/MX34bIpAAAAQA= + H4sIAAAAAAAAAO3dP0/bQBjAYYuuTBULMNGhU0o6NBUT9ff/VI1FrFqRfT0nDvfvGR6lA8N7/TkXxyTmruu6OwAAAAAAAAAAAAAAgMLsMpgBSOdHBjPwue5Pj+P+PxwDDxnMVaunzDyftR8eHzOYa8nXlVL3LsWuK3v/178OY7c/M1LPVqvz/T91//7oy4zUs3F7bwvt9W+D/m1rqf9jBjPkZDjH6xfa19iff0Ld9a9baM/Xf73vGcywRh/RXv86xT739Q8r7TmvP/qjf9v0b8/0d3p9ZHv967Cmt/51WbPX61+fUP/Xo/3ET/2rE+r/u/v47Mevk+Hf58dA6vmJs5t0nIrpP9V3+pdo6btEof7vZ+3nfjb1uriuf7/QfnoMhN4Xpl4X1/WfO6dz/l+fS/Z//euhf9uW+s+9p9N/3ngO9J7BLFv1H4+Bpes7+n/oJ2t+zWCeLfuPLnktSL0u7a/vP35OSf95475Yavv/9R/pv2x/euy7+l7/9Y837AUl7gMx/fuV7VvsX6rDyaXXgfWvw1z/a64BpV4P+tfoVt8d2fr3QKn/n9im/6XHQOr1sF3/QeizfvqXb809hfcRUq+H2/UPcS+/MrmneNsOAalnAwCAGjjnblsO93BHf/QnTX/XytuV0/O/1HuSliyn/mwv9P7uoD8AAAA0q5XrcP7uOwBAXYa/l/4U6SGDednWy9G3SKlnJV+xe8jWnjNYOwDU4r7zOgsAAAAAAAAAADUJfVcg9WwAAMDn+Quoy8MLAAABAA== -- cgit v1.2.3-70-g09d2