fixed for compile
Merge branch 'master' of https://github.com/chrisburnham/graphics

Conflicts:
	graphics/include/mipmap.h