Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 22 Mar 2013 11:49:13 +0100
changeset 19959 8b823e1919e3
parent 19954 11600ac7d1e4 (current diff)
parent 19958 6c1df6108c16 (diff)
child 19960 619193e0f75e
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 Mar 21 17:45:39 2013 +0100
+++ b/.hgsigs	Fri Mar 22 11:49:13 2013 +0100
@@ -105,3 +105,4 @@
 45094782a0cc8a27d021572642f0abf8e6ea9697 0 iEYEABECAAYFAlEIytcACgkQCX/oGf+2qkPKZgCghuesX8YSxkBnJ7vqKPIlADohobEAoNTswW+87EUC13eIz6yzy/kmWpwZ
 cd9fe4727ba89b6fc108d9e7e48cc222c24016e4 0 iEYEABECAAYFAlEkZrgACgkQCX/oGf+2qkNMEgCfVeNFe/nvgxNXwEUvbbIp6tqdAJ0AoK+83WD/fS6bRKK2xEgc5gwYlFJP
 2eb40756a1ed20c690c9158cd84aa62ea34ac339 0 iEYEABECAAYFAlEjW+AACgkQCX/oGf+2qkNupQCgz0W/xoRPzBsfhdSFgcD+vJy9aPAAoNfJeFhJ+psPdkmsZmz8fYvRg8DT
+1983af93019a75c0f0b130181b3ed8bb7d83bd8c 0 iEYEABECAAYFAlE42u0ACgkQCX/oGf+2qkNZQgCeKbV0dJ/m8Mcri1w7Xw3bB2dzAU0An02XW44EzaErkug0oKK6bkYmDmRA
--- a/.hgtags	Thu Mar 21 17:45:39 2013 +0100
+++ b/.hgtags	Fri Mar 22 11:49:13 2013 +0100
@@ -116,3 +116,4 @@
 afbda5fe9b744cfc0bcae7de8b1d6537b9aa661e 3.0MP19.3
 42352a2a7b5be48801784583817c082e2ec11af2 3.0MP19.4
 60f345bac02b65b2e09ad4e540c70875197ce76f 3.0MP20
+79ef7f4b625d71d1c8a6520648e528f9a722ab60 3.0MP21