]> git.itanic.dy.fi Git - sdl-planets/commitdiff
Merge branch 'master' of git://itanic.dy.fi/sdl-planets
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Mon, 5 Apr 2010 16:36:45 +0000 (19:36 +0300)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Mon, 5 Apr 2010 16:36:45 +0000 (19:36 +0300)
1  2 
main.c

diff --cc main.c
Simple merge