]> git.itanic.dy.fi Git - sdl-planets/commit
Merge branch 'remote'
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Sat, 6 Feb 2010 10:05:29 +0000 (12:05 +0200)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Sat, 6 Feb 2010 10:05:29 +0000 (12:05 +0200)
commitc0f2fb88543ee41883ab8fbf46fbf628077de05d
tree104f3779158f6d48026039e7d62fa1e4915c4cc0
parent80a22e5ef8c3d6a38aeb5b3da36a1be3384f74e8
parented69e170de2fb31687bb8fda4b6c94592c0f291d
Merge branch 'remote'

Conflicts:
Makefile
main.c