]> git.itanic.dy.fi Git - sdl-planets/commit
Merge branch 'master' of /home/git/sdl-planets
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Sun, 21 Feb 2010 11:47:07 +0000 (13:47 +0200)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Sun, 21 Feb 2010 11:47:07 +0000 (13:47 +0200)
commitd86a9e56a82d20a3a3205b05979f2c56aefa4309
tree7cbe6d26dbe8e29b62f6eedb1de1104f865e6515
parentde44f446761ac86fe5815d054fe52de8468a31b7
parent1addd66917b68e0ff6d909181a65161899223c4e
Merge branch 'master' of /home/git/sdl-planets

Conflicts:
Makefile
Makefile
main.c