]> git.itanic.dy.fi Git - sdl-planets/commit
Merge branch 'master' into dirty_work dirty_work
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Mon, 7 Feb 2011 19:58:14 +0000 (21:58 +0200)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Mon, 7 Feb 2011 19:58:14 +0000 (21:58 +0200)
commit2863341b1bab0ef962c4f52f52e87d5673c32008
tree3b1430636c3892df18762b34c170d12f51220fb4
parenta1144cc511c85f331c9cf6d8de6e000ec08b1795
parent2b3c16f439021118e2a94b86676b97e1b8922694
Merge branch 'master' into dirty_work

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