
# Conflicts: # src/group_gui.cpp # src/lang/german.txt # src/lang/korean.txt # src/lang/traditional_chinese.txt # src/pathfinder/yapf/yapf_rail.cpp # src/saveload/vehicle_sl.cpp # src/window.cpp
# Conflicts: # src/group_gui.cpp # src/lang/german.txt # src/lang/korean.txt # src/lang/traditional_chinese.txt # src/pathfinder/yapf/yapf_rail.cpp # src/saveload/vehicle_sl.cpp # src/window.cpp