# Conflicts:
#	src/renderer/Hud.cpp