Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 29 Nov 2012 19:11:50 +0100
changeset 18776 dccb1d65d4fb
parent 18775 8e775c18f204 (current diff)
parent 18770 18d5c4281386 (diff)
child 18777 6bae9e346d78
Merge back from main
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Wed Nov 28 16:26:43 2012 +0100
+++ b/.hgsigs	Thu Nov 29 19:11:50 2012 +0100
@@ -88,4 +88,5 @@
 aee16f41346874b9e355af6007df8df57b7f0266 0 iEYEABECAAYFAlBut3kACgkQCX/oGf+2qkPE8gCaAyk5dQSNyoOSpzPeOEtOLBhrF0MAn3XWPPVJ1Pb7vCei3oE3aQ8Ctj9o
 99f8eda49e53a4782416f5b18442945c4b5e63b5 0 iEYEABECAAYFAlCRrN8ACgkQCX/oGf+2qkOAJQCdGW7u6kmDrbDAerqPP8WEjveCCA8AoKnuoxJ0oG4YoECyXIAAFwQPVR+/
 4b4a381ce5f1ab178b70cff0408a704d2664eeb4 0 iEYEABECAAYFAlCqKx0ACgkQCX/oGf+2qkNnsgCgqCiBKwrB3BQ/UmF4dUpLYikmilcAniEMo6Ksu0zMxz93ych/mjpKg9Kx
+dcee1af5f243600cbed68798e892b7ba73a06ffa 0 iEYEABECAAYFAlC081kACgkQCX/oGf+2qkMU0ACfVvvLz1k+IF5axkQ2PQbFbJdLAVgAoN8XtUH6J76jpKSCx3GriplFPxdl
 d9dc1dcdb1f7da6ca0e0fcff57ac4f6c2f5e938c 0 iEYEABECAAYFAlCj2v8ACgkQCX/oGf+2qkPEsgCeOLWp7v5gU6Ip90kOBdOF+mejRHsAoObtRXJVe+gNq2nUa7Xu1EbVxsag
--- a/.hgtags	Wed Nov 28 16:26:43 2012 +0100
+++ b/.hgtags	Thu Nov 29 19:11:50 2012 +0100
@@ -99,4 +99,5 @@
 1cd80d4b32bbafca742ca1406fee082f97f5f254 3.0MP16
 84deb08844286485e5f948cdf06cec2ea727eddf 3.0MP16.1
 5a6b145a6dc21559e964dfc21039cf68ac3db351 3.0MP16.2
+c8ad7ddf47ddda7a33b56bafceff8d1ae5dadef2 3.0MP16.3
 f731024ec763373bd02a0825d0f42e1ddb15eb32 3.0MP17