]> git.itanic.dy.fi Git - sdl-planets/commitdiff
projects / sdl-planets / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64539dd 599ac8f)
Merge branch 'master' into work
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Sat, 24 Apr 2010 13:35:28 +0000 (16:35 +0300)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Sat, 24 Apr 2010 13:35:28 +0000 (16:35 +0300)
Conflicts:
planet.c
planet.h
quadtree.c

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

diff --cc main.c
Simple merge
Gravitation simulator