git.itanic.dy.fi Git - sdl-planets/commit

]> git.itanic.dy.fi Git - sdl-planets/commit

author	Timo Kokkonen <kaapeli@itanic.dy.fi>
	Sun, 31 Oct 2010 09:18:19 +0000 (11:18 +0200)
committer	Timo Kokkonen <kaapeli@itanic.dy.fi>
	Sun, 31 Oct 2010 09:18:19 +0000 (11:18 +0200)
commit	a04a6430c5087f9bc9f431b007bda6e319a013c4
tree	b74f9cbf75ebd104c3e7208be9e6f29f62dc1c50	tree \| snapshot
parent	9a1c11041d946f066d81a436733b3b9e5327fabd	commit \| diff
parent	d9fcef3b3846fad40c14fbc1efae6327dbf82f99	commit \| diff

Merge branch 'master' into HEAD

Conflicts:
main.c
planet.c

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>

Gravitation simulator