oops. hopes this was my one and only non-compiling commit ever
Merge branch 'cross-build-abs-fix' of https://github.com/kevingranade/Cataclysm-DDA into kevingranade-cross-build-abs-fix
Added support for dynamic linking and some other stuff.
Merge branch 'master' into FrankenMod
Merge remote-tracking branch 'cSep/targeting' into FrankenMod
Merge branch 'MakefileDynamic' into FrankenMod

Conflicts:
	Makefile
endif