]> git.itanic.dy.fi Git - sdl-planets/commit
Merge branch 'master' into work
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Sat, 24 Apr 2010 13:35:28 +0000 (16:35 +0300)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Sat, 24 Apr 2010 13:35:28 +0000 (16:35 +0300)
commit9e0aca9cdc2061cfe24cbc7a0ed51d919aa4090f
treef5f665bbc9ca0213d68601727259d09f2d559d71
parent64539ddeea0fa03e81f79f6de6cad481b0e0704b
parent599ac8f467bde1e71e8a2b034d9988c6b1cb3807
Merge branch 'master' into work

Conflicts:
planet.c
planet.h
quadtree.c
main.c