Merge back from main
authorPriya Muthukumar <priya.muthukumar@openbravo.com>
Thu, 16 Feb 2012 15:24:24 +0100
changeset 15527 2965b5f45e69
parent 15526 9db9dec2ecac (current diff)
parent 15289 b3e0f9d55682 (diff)
child 15528 f5a68090da7c
Merge back from main
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_MODULE.xml
src/org/openbravo/erpCommon/info/AttributeSetInstance.java
--- a/.hgsigs	Thu Feb 16 14:35:52 2012 +0100
+++ b/.hgsigs	Thu Feb 16 15:24:24 2012 +0100
@@ -54,6 +54,7 @@
 29635597c9b7110b66a4cde8e0cb0ece277f7407 0 iEYEABECAAYFAk7l05YACgkQCX/oGf+2qkNbCACgoK+bQ83JFW2GQb4j+YBkkBkrMOYAoKDSHPagp61WCcrPkCS7IEtmVI0E
 bc63869ec25d6771e0b3d3b65ddd630873663fc2 0 iEYEABECAAYFAk7h3vAACgkQCX/oGf+2qkP/HwCgt39R5/w8cF35rRoORikICeXQuDYAn347sM4ST4OvagS5ke9c6whsBYud
 5bb9eb1d86194a2fcf8779d28ee7bb131c53f20d 0 iEYEABECAAYFAk8BnJcACgkQCX/oGf+2qkMN7wCg+wl5wJjx0Y60WgZq3PRlBi3T3OoAmQGlwF1vK52FNykjDiACN+7Xdzjh
+f7c288af065f5425b20bd8bbef645df237282d4c 0 iEYEABECAAYFAk87pWEACgkQCX/oGf+2qkM1cgCg5Cp8jLM2gcEh+e+4QiJSJanE6J4An1iZUE2/OlrA8jLt9SQCs6/efCNq
 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 16 14:35:52 2012 +0100
+++ b/.hgtags	Thu Feb 16 15:24:24 2012 +0100
@@ -68,3 +68,4 @@
 5e317c1d2b1e4486fa345a5dd0ba3982e596c8cf 3.0MP7
 ed6c72ed7483eeb5a797ae9e1e7dd8775802a4eb 3.0MP7.1
 ed6e739763b02d5187fe9bb544dd3d1d9143a716 3.0MP7.2
+746b477b1018404f6781714b9db63e389e5dc828 3.0MP7.3