]> git.itanic.dy.fi Git - sdl-planets/commitdiff
projects / sdl-planets / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de44f44 1addd66)
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)
Conflicts:
Makefile

1  2 
Makefile patch | diff1 | diff2 | blob | history
main.c patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc main.c
Simple merge
Gravitation simulator