]> git.itanic.dy.fi Git - sdl-planets/commitdiff
projects / sdl-planets / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80a22e5 ed69e17)
Merge branch 'remote'
authorTimo Kokkonen <kaapeli@itanic.dy.fi>
Sat, 6 Feb 2010 10:05:29 +0000 (12:05 +0200)
committerTimo Kokkonen <kaapeli@itanic.dy.fi>
Sat, 6 Feb 2010 10:05:29 +0000 (12:05 +0200)
Conflicts:
Makefile
main.c


Trivial merge
Gravitation simulator