Merge from main, to import tags
authorJuan Pablo Aroztegi <juanpablo.aroztegi@openbravo.com>
Mon, 01 Feb 2010 19:03:27 +0100
changeset 6012 75a34559be38
parent 6011 0b2b6a389f51 (current diff)
parent 6007 3d5bd712a24b (diff)
child 6013 d226562ab1ea
Merge from main, to import tags
--- a/.hgsigs	Mon Feb 01 12:14:40 2010 +0100
+++ b/.hgsigs	Mon Feb 01 19:03:27 2010 +0100
@@ -10,3 +10,4 @@
 9f91fb70ebff156b6650de4e255fe723f2262fd7 0 iEYEABECAAYFAkroDJIACgkQCX/oGf+2qkOYgACdFu7ttmyClvcEKNJb4hTStIEggmkAoNOEc7lBPEfPizXiCfeRDGBOF7OF
 e7c306101389e980c1a1fb9d1bfeb3e200efaa94 0 iEYEABECAAYFAksNhdEACgkQCX/oGf+2qkNCCgCfVvVHzYDUBoPwv3mHqE+dLpz88UsAnRrvpWvUmXozxdaMD0X0IV123bH0
 0b5e5cf1aa6b85df792522ed84d9755a1563c4f6 0 iEYEABECAAYFAktQTfIACgkQCX/oGf+2qkMeKgCgxxmPlv10O2oQEIEF18iBJR5hD4AAn1VYgmnxMZUGQA7WT6/j8PtMV9je
+630f94155c011c18a4bd948239d674953ad729c4 0 iEYEABECAAYFAkthyKQACgkQCX/oGf+2qkOIwgCcCk4MJcMrnHR9WgEGfRx4HoTYfjsAn26YI0m1bCQSlyqmh+gDusmsqrNA
--- a/.hgtags	Mon Feb 01 12:14:40 2010 +0100
+++ b/.hgtags	Mon Feb 01 19:03:27 2010 +0100
@@ -20,3 +20,4 @@
 6a836f38131f9c289b9f3a838b728711ddd277fb 2.50MP8
 003090f7d33a5d408405addea4c74ca8e1d9f186 2.50MP9
 f873f7f56a657920123211550340ca358e270de7 2.50MP10
+98d31cbff884dd20581e1cafad505ed8f9b33273 2.50MP11
--- a/src-db/database/sourcedata/AD_MODULE.xml	Mon Feb 01 12:14:40 2010 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Mon Feb 01 19:03:27 2010 +0100
@@ -6,7 +6,7 @@
 <!--0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0-->  <NAME><![CDATA[core]]></NAME>
-<!--0-->  <VERSION><![CDATA[2.50.15808]]></VERSION>
+<!--0-->  <VERSION><![CDATA[2.50.16006]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
@@ -21,7 +21,7 @@
 <!--0-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0-->  <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0--></AD_MODULE>