Merge back from main
authorPriya Muthukumar <priya.muthukumar@openbravo.com>
Thu, 09 Feb 2012 11:59:16 +0100
changeset 15426 34b28a21b89d
parent 15425 cc8d0c0aab83 (current diff)
parent 15284 64d4473ba03d (diff)
child 15427 a35287af26c4
Merge back from main
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_MODULE.xml
--- a/.hgsigs	Thu Feb 09 11:52:20 2012 +0100
+++ b/.hgsigs	Thu Feb 09 11:59:16 2012 +0100
@@ -50,8 +50,10 @@
 e3386a2cd54020855bb2b3efa1c0afcfdf30a2b4 0 iEYEABECAAYFAk67/uoACgkQCX/oGf+2qkPXfQCg3lQiuBbJnVsPfnL8LWukEVG5CsIAoKsRfoVp93C1SY2N0iMl1LqT7CmB
 9bb62accddbd9114aa4562816ab5b0234b01b1fa 0 iEYEABECAAYFAk7Gf8IACgkQCX/oGf+2qkMwUACfbNSWszDOxciN14aA09Oe8da52TIAn3xc3Kgek0jmetz0q+lzPVxdAjjk
 1421ed09d86c5034375386393db18b2dc8866f77 0 iEYEABECAAYFAk7c/wQACgkQCX/oGf+2qkPZnwCfdfdLV/fHXKEXL0S+g9ip2PZuc5gAoL89Tv+s7FGS6g9HCfZSAkm76AF3
+cb27736b6ddbcf70d5a9c8878bdb012134818585 0 iEYEABECAAYFAk8pORIACgkQCX/oGf+2qkNT1ACgt0zVkZRcUGvubOPpiwStjh2c41YAn2J6v2/Cop95IKkUtVaBclL4c+89
 29635597c9b7110b66a4cde8e0cb0ece277f7407 0 iEYEABECAAYFAk7l05YACgkQCX/oGf+2qkNbCACgoK+bQ83JFW2GQb4j+YBkkBkrMOYAoKDSHPagp61WCcrPkCS7IEtmVI0E
 bc63869ec25d6771e0b3d3b65ddd630873663fc2 0 iEYEABECAAYFAk7h3vAACgkQCX/oGf+2qkP/HwCgt39R5/w8cF35rRoORikICeXQuDYAn347sM4ST4OvagS5ke9c6whsBYud
 5bb9eb1d86194a2fcf8779d28ee7bb131c53f20d 0 iEYEABECAAYFAk8BnJcACgkQCX/oGf+2qkMN7wCg+wl5wJjx0Y60WgZq3PRlBi3T3OoAmQGlwF1vK52FNykjDiACN+7Xdzjh
+4463903e11ac52337be6041dcfb593022f35427f 0 iEYEABECAAYFAk8qiYkACgkQCX/oGf+2qkP6cgCfcsvKoCUqTvEE9+9qeLRBrjKy64YAn1Eg4n1WZcu4dxxnIDgAsjEywG/C
 d034d0b54ffb6c401b3741be99d4237f82aa9d76 0 iEYEABECAAYFAk8EN/IACgkQCX/oGf+2qkMPzgCg/gXTYW5Vv9s02aG3VAi3lSvNiMwAn29/22CruqkJ9sTWkyA8lCChqk/r
 aa474df671aa2c3d4a16419479cf8098d5fbca82 0 iEYEABECAAYFAk8N8JAACgkQCX/oGf+2qkMFLACbB+b+pdKa0rd7O+ig6so/ETi1x0YAnRKPM91wMwdONWZ5AOazDoSj6h/c
--- a/.hgtags	Thu Feb 09 11:52:20 2012 +0100
+++ b/.hgtags	Thu Feb 09 11:59:16 2012 +0100
@@ -64,5 +64,7 @@
 efa17c6fbb3b286f790ea5b029b1f6fd2b1e5195 3.0MP5.3
 1b8d2b0f0c3f8af08af1d86f0f3f3c252319b0fa 3.0MP6
 5b449c72b2e674843a4f8949d34aa46e2fced9ea 3.0MP6.1
+3f2e88c8c85d6f09fc8d466b9420fb192e2a606e 3.0MP6.2
 5e317c1d2b1e4486fa345a5dd0ba3982e596c8cf 3.0MP7
 ed6c72ed7483eeb5a797ae9e1e7dd8775802a4eb 3.0MP7.1
+ed6e739763b02d5187fe9bb544dd3d1d9143a716 3.0MP7.2