diff options
| author | Olivier Dony <odo@openerp.com> | 2012-08-03 16:24:50 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-08-03 16:24:50 +0200 |
| commit | f0873dcb32a673c83a7d9e5c3e35f4226d9051a8 (patch) | |
| tree | 669f2f30cb225f24681cb6de886c8fb6e0a49ea5 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | 093f7392738355edb718e777bd951908c29c12ec (diff) | |
| parent | c61431bd3ee9db871317156fddb80ce662543f96 (diff) | |
[MERGE] Sync with trunk - bunch of conflicts resolved
bzr revid: odo@openerp.com-20120803142450-97z551yam1js822h
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions