]> git.itanic.dy.fi Git - sdl-planets/commitdiff
Merge branch 'master' into quadtree-dev
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Mon, 5 Apr 2010 13:04:13 +0000 (16:04 +0300)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Mon, 5 Apr 2010 13:04:13 +0000 (16:04 +0300)

Trivial merge