Merge temporary head for 3.0MP28.5
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 24 Dec 2013 07:19:32 +0000
changeset 21693 99bf890049d9
parent 21687 a142b9d853cc (current diff)
parent 21692 147201624bd8 (diff)
child 21695 a6ebb8307561
Merge temporary head for 3.0MP28.5
.hgsigs
.hgtags
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.kernel/src/org/openbravo/client/kernel/KernelUtils.java
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	Mon Dec 23 10:49:59 2013 +0100
+++ b/.hgsigs	Tue Dec 24 07:19:32 2013 +0000
@@ -132,6 +132,7 @@
 3dff4a5ade8aa7966fde9139428e968fb7f04218 0 iEYEABECAAYFAlJlPOMACgkQCX/oGf+2qkPsbgCg4w/JC1tFhyxz6mXa6UBOaEYz6esAnRCq24eVAcoNGrAfIfhXvKUBuQMQ
 8b9a63ffa8e5d52b063db22a52f747a3c616affc 0 iEYEABECAAYFAlKe/L8ACgkQCX/oGf+2qkMfuwCfafnQo9e1Wva5pycMnkB4/WDQgJoAoLJdXDJt51XxtNI5Orod5XJA+HMX
 bfe21782cd33b4c3bed1cd733f455de6dc61c766 0 iEYEABECAAYFAlKup5AACgkQCX/oGf+2qkNIUwCgmrPTAq/4glNIJPzOxIl9C5gw1pEAoN+hKrdK0v/e9SEVmKsNYlQx/NZr
+91ad366d9f86581478da0bb3d99d7ff3331cc122 0 iEYEABECAAYFAlK4JWQACgkQCX/oGf+2qkMErACg7Iyuv6yHr/cH6r73takBnxpIo68AoK9F6kNatgr1uLzcuYEJmvpTEa+f
 2630b57465e0c53e77eb0c08140ad461f8a6024f 0 iEYEABECAAYFAlKF+CoACgkQCX/oGf+2qkOn9wCeKuzyuNK/+6xev5U3u8tO6W0eT1YAmwbnnNrtFQRhq0Wd3jFWpbykW/vI
 f2a17a54900bff00269ae2ea9b904a32134de48f 0 iEYEABECAAYFAlKMuRsACgkQCX/oGf+2qkN1pwCeJzq8oiozQ5qgSNB6ZBboqjEwppEAniyBrwJie/OiwFTaP5VIxp+ceDSQ
 4c222ccbbea79a4343b1ff1729106becebebbc39 0 iEYEABECAAYFAlKwPmcACgkQCX/oGf+2qkP0awCfVBWE5p7hLNtnbzLL60SS5+ZsrogAn1d7xhYIm/nJ03Jlqs1jXg0iJcgM
--- a/.hgtags	Mon Dec 23 10:49:59 2013 +0100
+++ b/.hgtags	Tue Dec 24 07:19:32 2013 +0000
@@ -143,6 +143,7 @@
 0c73b69e61c55d8de0b3a0dfcc2e7511fa8a295f 3.0MP28.2
 72950e8d3e2a52a8c2c704f38f53977dcd46a297 3.0MP28.3
 0b0fda0f36cb25ffd9652b73d69d81f711275091 3.0MP28.4
+557cef358a018c6b4b42bb416a94a18b973773ae 3.0MP28.5
 cf86ae37f1bab9f9e401a6835258aabbdc91a705 3.0MP29
 f7af9706971ab040115da0a457c0034c53731ead 3.0MP29.1
 d58f931280521ed35a3bfc7d7fcaa60186489ba2 3.0MP30