]> git.itanic.dy.fi Git - sdl-planets/commitdiff
Merge branch 'master' into quadtree-test
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Mon, 5 Apr 2010 12:50:59 +0000 (15:50 +0300)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Mon, 5 Apr 2010 12:50:59 +0000 (15:50 +0300)
1  2 
planet.c

diff --cc planet.c
Simple merge