Merge back from main
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 30 Oct 2012 22:09:03 +0100
changeset 18385 f52a35958041
parent 18384 26799413cdbc (current diff)
parent 18288 31f31b00e571 (diff)
child 18386 9e773cbcb723
Merge back from main
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
referencedata/sampledata/F_B_International_Group.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_PROCESS_PARA.xml
src-db/database/sourcedata/AD_REFERENCE.xml
--- a/.hgsigs	Tue Oct 30 17:47:23 2012 +0100
+++ b/.hgsigs	Tue Oct 30 22:09:03 2012 +0100
@@ -81,6 +81,7 @@
 6476bb0e9da298f7adb7759265f784d9eb28884d 0 iEYEABECAAYFAlBkPuAACgkQCX/oGf+2qkMUxgCgglb7oUz6aO/2IC55x7u2xRy65HoAnj83lJHvsqrlllOquMxoLJ2UkTkO
 3ef42df4953f5813543c5d1cb2b323d13c8c0359 0 iEYEABECAAYFAlA/cv4ACgkQCX/oGf+2qkMT3gCgjbewzyw3X/1MOZjn6V5P3HqrQtoAoPdsUsBzwVelyg7jpbUhhzGW5Vbz
 d221450bb4d5334f101e6d0fe5d2e941bb714f0a 0 iEYEABECAAYFAlBqvAsACgkQCX/oGf+2qkNIogCfTU6AVwlfmEH2DZUjGkiE1zzo25MAoOkIN46+PHwWKslqp5lxFShVzVTd
+18d1c926f607a207a86f39f4cb0477d7abaea231 0 iEYEABECAAYFAlCITCEACgkQCX/oGf+2qkMxggCg0SsDTC/8I/S7f7HTRlKS8ZtABzwAoOiVWjBJkbhwi7ZxJDEVQA1E/6aH
 7643bde3a4855fc35ddf7269a221ba0e77863a75 0 iEYEABECAAYFAlBgQyAACgkQCX/oGf+2qkNE2ACfb7Xzd4dq5VTeUnFo9VSsPqoQHtsAn063Puz1dhXpBsvhgkpbDV7fXiR6
 2680cddd9aca96f87a83156d3ca27935a692dfb3 0 iEYEABECAAYFAlBsebEACgkQCX/oGf+2qkMexACdFPyyCM6bMSTiXilJF9M61iXNBQ4AnAwzonIXgFkr4tyY1WHa+PGw3caA
 aee16f41346874b9e355af6007df8df57b7f0266 0 iEYEABECAAYFAlBut3kACgkQCX/oGf+2qkPE8gCaAyk5dQSNyoOSpzPeOEtOLBhrF0MAn3XWPPVJ1Pb7vCei3oE3aQ8Ctj9o
--- a/.hgtags	Tue Oct 30 17:47:23 2012 +0100
+++ b/.hgtags	Tue Oct 30 22:09:03 2012 +0100
@@ -92,6 +92,7 @@
 141c70bce6606bca6bf2b8422b9c27fbf19e7ede 3.0MP13.2
 35168ddf12d33e94aeb18d2c79c6d9255a26c742 3.0MP14
 6861c9689350eae52de16fad01f78b37f5164c9e 3.0MP14.1
+91fb79467af4f71728e776b69dd1092dab8b2b5f 3.0MP14.2
 bf2e6628cebd62b56796fe8433c35378d516e375 3.0MP15
 fa0e90f7e9eed2e99536b6c372a15a2448c03d06 3.0MP15.1
 1cd80d4b32bbafca742ca1406fee082f97f5f254 3.0MP16