Merge temporary head for 3.0MP3.2
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 15 Nov 2011 16:24:18 +0000
changeset 14259 63fba01f3def
parent 14254 22d704d9f2e8 (current diff)
parent 14258 d487510d22f9 (diff)
child 14264 84211b731f17
Merge temporary head for 3.0MP3.2
.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.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
src/org/openbravo/erpCommon/utility/Utility.java
--- a/.hgsigs	Tue Nov 15 16:55:39 2011 +0100
+++ b/.hgsigs	Tue Nov 15 16:24:18 2011 +0000
@@ -43,6 +43,7 @@
 819660861fcf70114fd97793de78cec4cc3ef63b 0 iEYEABECAAYFAk6ZYrAACgkQCX/oGf+2qkODfgCeNU807u8Lz0PaEwb/4hkZzwHn8l8AoLwXed7lxTH/jybwSSOGvGMde+M/
 36fbd0e92534c9261754d500e9ef0d1a45744b59 0 iEYEABECAAYFAk6B2kgACgkQCX/oGf+2qkPXrwCghp9G3HStth7Hc4vevflmiJsaL/sAoLKnTFUyu4ZX8mlLusps5zAiWNjT
 851d60ba120c48644beb5b9469acff1dbdb7368c 0 iEYEABECAAYFAk6daREACgkQCX/oGf+2qkN7twCg2ekW1o6w98p9Bvacblx2q3zOBYIAoJihfu3/n4If7/CHg4um1nqYvBvC
+0fb10ae9b5eee53054b228586d8f7314ed2618ae 0 iEYEABECAAYFAk6+i4IACgkQCX/oGf+2qkM0sgCg3d4/9MS1NndfLzLAOZ61YTpWwjsAnjUja/VH9rOSLJK1O/e0Zl0BHkZs
 19fb1243d437ff7490e6ad44018c4e403cf18af4 0 iEYEABECAAYFAk6YPpEACgkQCX/oGf+2qkO6NwCeJdcbggzlqxYL7K1NG98pjnWjH60AoL/aHl5Qi1e2UvFGbAeFcJZmR2AH
 6f5b96ecdf0cb377597c0abad63dc98aacfa3b6d 0 iEYEABECAAYFAk6gfrgACgkQCX/oGf+2qkN7WQCg/WowvRSY1dn1vXn2NRNWg/vL+YIAmwbYIbwrsnLS/rPFsoUDWsEMX2U6
 e3386a2cd54020855bb2b3efa1c0afcfdf30a2b4 0 iEYEABECAAYFAk67/uoACgkQCX/oGf+2qkPXfQCg3lQiuBbJnVsPfnL8LWukEVG5CsIAoKsRfoVp93C1SY2N0iMl1LqT7CmB
--- a/.hgtags	Tue Nov 15 16:55:39 2011 +0100
+++ b/.hgtags	Tue Nov 15 16:24:18 2011 +0000
@@ -54,6 +54,7 @@
 e67ea53b0101e8a09ede8823ebf90cfb6f01a60c 3.0MP2.4
 c7a189353e46e28e320809a2e8aaaaac8c6f67e2 3.0MP3
 90cf0099c87c7edc0fe925ffc5df21ea55449186 3.0MP3.1
+a3df646af3a532b3a028e65852cbe1ff7ddcd152 3.0MP3.2
 4e9fa8e7edbc01b25ebaa4aefb7b9cff61a91f98 3.0MP4
 f7371a7182533fe4717596b18262d42176fefe40 3.0MP4.1
 bee1528a5966a4681a86ed0c9f7129f8f8818ab1 3.0MP5