]> git.itanic.dy.fi Git - sdl-planets/commitdiff
Merge branch 'master' into quadtree
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Thu, 8 Apr 2010 16:34:41 +0000 (19:34 +0300)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Thu, 8 Apr 2010 16:34:41 +0000 (19:34 +0300)

Trivial merge