]> git.itanic.dy.fi Git - sdl-planets/commitdiff
projects / sdl-planets / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d22f03 22c5200)
Merge branch 'master' into work
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Sat, 10 Apr 2010 14:38:31 +0000 (17:38 +0300)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Sat, 10 Apr 2010 14:38:31 +0000 (17:38 +0300)
1  2 
main.c patch | diff1 | diff2 | blob | history

diff --cc main.c
Simple merge
Gravitation simulator