Skip to content
Snippets Groups Projects
Commit 9e6ffe4c authored by AdamBSimpson's avatar AdamBSimpson
Browse files

Merge branch 'color'

Conflicts:
	fractal.c
	fractal.h
parents 21c398cb a845d6cb
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment