]> git.itanic.dy.fi Git - sdl-planets/commitdiff
Merge branch 'master' of git://itanic.dy.fi/sdl-planets
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Sun, 31 Oct 2010 09:03:36 +0000 (11:03 +0200)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Sun, 31 Oct 2010 09:04:15 +0000 (11:04 +0200)
Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>

Trivial merge