From dd3bbca604658dc0819163aa758034423e067256 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 24 Nov 2013 10:50:58 +0000
Subject: [PATCH] Activated new ja2.ini entry (by Buggler) - MERGE_INI_FILES =
 Ja2_Options.ini - Very useful for players to maintain their custom ini
 settings in a 'portable' form across different mod and time dimension as some
 players will just gave up on trying another mod while going thru the
 humongous settings again and again.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6644 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 gamedir-languages/Chinese_Version/Ja2.ini | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gamedir-languages/Chinese_Version/Ja2.ini b/gamedir-languages/Chinese_Version/Ja2.ini
index b10774b50..a8ce7df21 100644
--- a/gamedir-languages/Chinese_Version/Ja2.ini
+++ b/gamedir-languages/Chinese_Version/Ja2.ini
@@ -42,6 +42,13 @@ VFS_CONFIG_INI = vfs_config.JA2113.ini
 ; JA2 Unfinished Business 1.13 - Vanilla (JA2UB Classic)
 ; VFS_CONFIG_INI = vfs_config.UBVanilla.ini
 
+;******************************************************************************************************************************
+; Merging of INI files across the various profiles as defined at [vfs_config] in vfs_config.XXX.ini
+; Settings is read from right to left, with 'UserProf' as the topmost/first order. Use ',' to include/separate other INIs
+;******************************************************************************************************************************
+
+MERGE_INI_FILES = Ja2_Options.ini
+
 ;******************************************************************************************************************************
 ; This only has effect if you use the INI Editor to start Jagged Alliance 2 v1.13.
 ; Otherwise you can ignore that.