# Conflicts:
#	gframe/config.h
#	gframe/drawing.cpp
#	gframe/event_handler.cpp
#	gframe/game.cpp
#	gframe/premake4.lua
#	gframe/replay.cpp
#	gframe/replay_mode.cpp
#	gframe/single_mode.cpp
#	lflist.conf
#	ocgcore
#	script
#	strings.conf