Merge branch 'master' into libmaplibmap
commitdab57df2162f37709430fe6b249ddf2d0be777d7
authorPetr Baudis <pasky@ucw.cz>
Sat, 30 Nov 2013 17:33:45 +0000 (30 18:33 +0100)
committerPetr Baudis <pasky@ucw.cz>
Sat, 30 Nov 2013 17:33:45 +0000 (30 18:33 +0100)
tree2316f5c918dc3b0b87ece2d07049f7f5a725e53a
parentfa208a23dfa77f6e9ff4035f87c47e8e616c048d
parent9aa644838e90c611cd0aa2b03577f268c9abe081
Merge branch 'master' into libmap
Makefile
playout/moggy.c
uct/walk.c