Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 16 Jul 2013 06:13:05 +0200
changeset 20744 43aac1aeed77
parent 20743 436cd2fa79fc (current diff)
parent 20692 bbdba26793ea (diff)
child 20745 9a5d5983399f
child 20753 4708a704c192
Merge back from main
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Thu Jul 11 11:15:06 2013 +0200
+++ b/.hgsigs	Tue Jul 16 06:13:05 2013 +0200
@@ -116,3 +116,4 @@
 859de1db934381df3b1eb0e863ec19a887565331 0 iEYEABECAAYFAlHbj5AACgkQCX/oGf+2qkMgJACgz7U/fVr1o5M08eTFaJQDldJ5xBoAoI6O81kGY5mmurordwIpiYKlT7wp
 b0634b11086a05db9d54275a05c64f23bf12f805 0 iEYEABECAAYFAlHBMSwACgkQCX/oGf+2qkOR+ACcDWGNCcZXny0x54Jkrc744UEpy3kAn3L1sDVMcfqraHG8ierwEcnOL9S3
 5efe3c4189c7db9b2ea2bdff73de3256217df045 0 iEYEABECAAYFAlHNMRQACgkQCX/oGf+2qkPkMACfSJJJM2kdf89Up4kfEbCZW/smRIEAoKbC5gBEuEKdflRQU5ber6TXErjQ
+d49b59c48d5f7d47d9d9505d2cf0ea5ea89b7070 0 iEYEABECAAYFAlHjfZMACgkQCX/oGf+2qkNnbgCg33P3BC6aXRRMGxtrdjpaugceKtUAoO6Nyy5jm/dx2xWnWBzg8u+F48BJ
--- a/.hgtags	Thu Jul 11 11:15:06 2013 +0200
+++ b/.hgtags	Tue Jul 16 06:13:05 2013 +0200
@@ -127,3 +127,4 @@
 af209003923492e8a18062c4dc58711d445345ed 3.0MP23.2
 692d465ddec51a2cf0798735abe7fa33436ac1ec 3.0MP24
 fdd2929b3158b981bad058be133c560874629a1c 3.0MP24.1
+895ac3b1f59a66db37a45476a6a82cdca0564ee8 3.0MP25