# Conflicts:
#	gframe/client_field.cpp
#	gframe/deck_con.cpp
#	gframe/drawing.cpp
#	gframe/duelclient.cpp
#	gframe/event_handler.cpp
#	gframe/game.cpp
#	gframe/game.h
#	gframe/menu_handler.cpp
#	gframe/premake4.lua
#	gframe/replay_mode.cpp
#	ocgcore
#	script
#	strings.conf
#	system.conf