Skip to content
Snippets Groups Projects
Commit 354bc99a authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Merge branch 'master' into GravityParticles 

Conflicts:
	examples/main.c
	src/engine.c
	src/engine.h

Use of threads as command-line option.
parents c0aa3063 622ad2b6
Branches
Tags
1 merge request!143Gravity particles
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 15 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment