Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 20 Nov 2012 14:46:21 +0100
changeset 18576 f7d9ab97c2e0
parent 18575 120e4b62fcd6 (current diff)
parent 18524 587bb5ea0920 (diff)
child 18577 776d5accc58d
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	Tue Nov 20 13:32:36 2012 +0100
+++ b/.hgsigs	Tue Nov 20 14:46:21 2012 +0100
@@ -87,3 +87,4 @@
 12914c7ff338d71cdb942a1222174e6afa8771b2 0 iEYEABECAAYFAlCO6PcACgkQCX/oGf+2qkMl/wCfRObV0QOmE8SyyLxPPehcVX51Ho8AmwaEYe6MQiQDKgTY6rm/XMlBvBRa
 aee16f41346874b9e355af6007df8df57b7f0266 0 iEYEABECAAYFAlBut3kACgkQCX/oGf+2qkPE8gCaAyk5dQSNyoOSpzPeOEtOLBhrF0MAn3XWPPVJ1Pb7vCei3oE3aQ8Ctj9o
 99f8eda49e53a4782416f5b18442945c4b5e63b5 0 iEYEABECAAYFAlCRrN8ACgkQCX/oGf+2qkOAJQCdGW7u6kmDrbDAerqPP8WEjveCCA8AoKnuoxJ0oG4YoECyXIAAFwQPVR+/
+d9dc1dcdb1f7da6ca0e0fcff57ac4f6c2f5e938c 0 iEYEABECAAYFAlCj2v8ACgkQCX/oGf+2qkPEsgCeOLWp7v5gU6Ip90kOBdOF+mejRHsAoObtRXJVe+gNq2nUa7Xu1EbVxsag
--- a/.hgtags	Tue Nov 20 13:32:36 2012 +0100
+++ b/.hgtags	Tue Nov 20 14:46:21 2012 +0100
@@ -98,3 +98,4 @@
 dd22f6b9902296a7d3f48b871fc8436ef20fdfdc 3.0MP15.2
 1cd80d4b32bbafca742ca1406fee082f97f5f254 3.0MP16
 84deb08844286485e5f948cdf06cec2ea727eddf 3.0MP16.1
+f731024ec763373bd02a0825d0f42e1ddb15eb32 3.0MP17