]> git.itanic.dy.fi Git - sdl-planets/commitdiff
Merge branch 'master' into work
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Sun, 11 Apr 2010 09:20:18 +0000 (12:20 +0300)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Sun, 11 Apr 2010 09:20:18 +0000 (12:20 +0300)

Trivial merge