[IMP] confliction resoved
authorHardik Ansodariy (OpenERP) <han@tinyerp.com>
Mon, 29 Aug 2011 06:21:49 +0000 (11:51 +0530)
committerHardik Ansodariy (OpenERP) <han@tinyerp.com>
Mon, 29 Aug 2011 06:21:49 +0000 (11:51 +0530)
commitf181077421646a17abef246295d7f7e538b75bcd
tree00e07d713cdc7698346ae85e1ed35aa2de21568e
parent875ecfcad9f380843441b02868153c20a670f3b5
parent65c43a1946a871a99642721b7a559f56df103d07
[IMP] confliction resoved

bzr revid: han@tinyerp.com-20110829062149-tfhlws3kv50wvmn9
addons/crm/crm_installer.py
addons/crm/crm_installer_view.xml
addons/crm/crm_lead_view.xml
addons/crm/crm_opportunity_view.xml
addons/mail_gateway/mail_gateway.py
addons/project/installer.py
addons/project/project_installer.xml