Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 18 Dec 2013 12:04:04 +0100
changeset 21670 2b930d42df25
parent 21669 469ba15fbba3 (current diff)
parent 21546 85d66fabd2b1 (diff)
child 21671 1baa22b97d51
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.application/web/org.openbravo.client.application/js/main/ob-standard-view.js
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	Wed Dec 18 09:05:46 2013 +0100
+++ b/.hgsigs	Wed Dec 18 12:04:04 2013 +0100
@@ -133,3 +133,4 @@
 8b9a63ffa8e5d52b063db22a52f747a3c616affc 0 iEYEABECAAYFAlKe/L8ACgkQCX/oGf+2qkMfuwCfafnQo9e1Wva5pycMnkB4/WDQgJoAoLJdXDJt51XxtNI5Orod5XJA+HMX
 2630b57465e0c53e77eb0c08140ad461f8a6024f 0 iEYEABECAAYFAlKF+CoACgkQCX/oGf+2qkOn9wCeKuzyuNK/+6xev5U3u8tO6W0eT1YAmwbnnNrtFQRhq0Wd3jFWpbykW/vI
 f2a17a54900bff00269ae2ea9b904a32134de48f 0 iEYEABECAAYFAlKMuRsACgkQCX/oGf+2qkN1pwCeJzq8oiozQ5qgSNB6ZBboqjEwppEAniyBrwJie/OiwFTaP5VIxp+ceDSQ
+4c222ccbbea79a4343b1ff1729106becebebbc39 0 iEYEABECAAYFAlKwPmcACgkQCX/oGf+2qkP0awCfVBWE5p7hLNtnbzLL60SS5+ZsrogAn1d7xhYIm/nJ03Jlqs1jXg0iJcgM
--- a/.hgtags	Wed Dec 18 09:05:46 2013 +0100
+++ b/.hgtags	Wed Dec 18 12:04:04 2013 +0100
@@ -144,3 +144,4 @@
 72950e8d3e2a52a8c2c704f38f53977dcd46a297 3.0MP28.3
 cf86ae37f1bab9f9e401a6835258aabbdc91a705 3.0MP29
 f7af9706971ab040115da0a457c0034c53731ead 3.0MP29.1
+d58f931280521ed35a3bfc7d7fcaa60186489ba2 3.0MP30