You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/03/31 22:12:12 UTC
svn commit: r1583433 - in /ofbiz/branches/release12.04: ./
framework/common/ofbiz-component.xml
Author: jleroux
Date: Mon Mar 31 20:12:11 2014
New Revision: 1583433
URL: http://svn.apache.org/r1583433
Log:
"Applied fix from trunk for revision: 1583428" (conflict handled by hand)
------------------------------------------------------------------------
r1583428 | jleroux | 2014-03-31 22:06:21 +0200 (lun. 31 mars 2014) | 1 ligne
Completes commit r1583427
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/framework/common/ofbiz-component.xml
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1583428
Modified: ofbiz/branches/release12.04/framework/common/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/ofbiz-component.xml?rev=1583433&r1=1583432&r2=1583433&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/common/ofbiz-component.xml (original)
+++ ofbiz/branches/release12.04/framework/common/ofbiz-component.xml Mon Mar 31 20:12:11 2014
@@ -46,11 +46,12 @@ under the License.
<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IT.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IN.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_IRL.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_MX.xml"/>
+ <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_MY.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_NL.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_PL.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_UK.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_US.xml"/>
- <entity-resource type="data" reader-name="seed" loader="main" location="data/GeoData_MX.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/LanguageData.xml"/>
<entity-resource type="data" reader-name="seed" loader="main" location="data/UnitData.xml"/>