Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 21 May 2015 14:46:06 +0200
changeset 26726 813d6271f672
parent 26672 f74892c7bc32 (current diff)
parent 26725 2cd1c165b01e (diff)
child 26727 78fa6e8fdcad
Merge back from main
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js
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.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Thu May 21 10:32:06 2015 +0200
+++ b/.hgsigs	Thu May 21 14:46:06 2015 +0200
@@ -168,4 +168,6 @@
 831f7c3e542951b324cd9880b198bb4751bfd251 0 iEYEABECAAYFAlTm9ToACgkQCX/oGf+2qkPpFgCgzIKSAc1CMJoGRySzaUNdjoiyXyUAn2N/WoGlO000oJ6LcEcBldIz3+iT
 295e0a259f619311101efee9f1d31aede5bdaa95 0 iEYEABECAAYFAlUZK3oACgkQCX/oGf+2qkOrywCdFORG9mDgA9SMY95tQrtMYtUftS0AoK6d8rFNeUz9xDvAP/y0B+2myvoN
 4d63b001f63758b1b79b9502621754878acdfdff 0 iEYEABECAAYFAlUwx7cACgkQCX/oGf+2qkOn2gCcCxKfDDCR1P8qYR9bNtxTIs81JY8AniiMcNvRgeOQ6DOF+jHHVksUM4eO
+ac3537eef819b48dc9888d5ab0d4fec470158bef 0 iEYEABECAAYFAlVbMyIACgkQCX/oGf+2qkPRzwCfYI94AYb2DYsvojxmVtqMVqKjGiQAoIfADynxGuktv9GHEwfJOnnLCxv3
 ac761ac78f576cee64046e115ac42d2a3b227682 0 iEYEABECAAYFAlVItlgACgkQCX/oGf+2qkPgSACeNz58xoUWpTvMywmncbWx7+r7bnUAn1Ba1al80Q9HMY/wiMNu1Vfpd9Jo
+fdb1e0cd936d09381ae1aa87be98cc4f0f334f31 0 iEYEABECAAYFAlVbM8QACgkQCX/oGf+2qkO+wACfTbKub/UT0e2V2iyIB21716NAn/oAoIHu7PYZ7w/BkTQDZWR0PXDdYkty
--- a/.hgtags	Thu May 21 10:32:06 2015 +0200
+++ b/.hgtags	Thu May 21 14:46:06 2015 +0200
@@ -179,4 +179,6 @@
 39f3bed2ed0eaa2a7e69a46d7bf417c346e25a6a 3.0PR15Q1.1
 31dfe7896f8fcd9390b979d7c6972f5aea00d199 3.0PR15Q1.2
 ad409516bfa0b1c6f7ab128cab4526dd5058c787 3.0PR15Q1.3
+d5ec99ff8e8e301cf4bf673f37b9c04ea1758f98 3.0PR15Q1.4
 4239774eb8de8f0740bfbd6e3e36c075ee2a5a91 3.0PR15Q2
+e861122b0b1d2aa2ca6e177bfbb9ddf939e33dd7 3.0PR15Q2.1