diff options
| author | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-05-28 18:37:27 +0530 |
|---|---|---|
| committer | Sanjay Gohel (Open ERP) <sgo@tinyerp.com> | 2012-05-28 18:37:27 +0530 |
| commit | 911f71dd8543368e502102d4d8b4bb79c188bffd (patch) | |
| tree | 79028ab23e2bc61641b1f62fd12b74f7fd4529e2 /addons/project_long_term/project_long_term_view.xml | |
| parent | 0e90703ad0d1727c7a4511e30f335c0a3667357c (diff) | |
| parent | 250702de4c45f2a1364c5eaf69e2404bf990232c (diff) | |
[MERGE]merge and remove conflicts
bzr revid: sgo@tinyerp.com-20120528130727-d2czzzkspgwib2vd
Diffstat (limited to 'addons/project_long_term/project_long_term_view.xml')
0 files changed, 0 insertions, 0 deletions