summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function/analytic_user_function_view.xml
diff options
context:
space:
mode:
authorSanjay Gohel (Open ERP) <sgo@tinyerp.com>2012-07-27 10:39:07 +0530
committerSanjay Gohel (Open ERP) <sgo@tinyerp.com>2012-07-27 10:39:07 +0530
commitb83d61c63558674fe07ef82df3836da5b19755c2 (patch)
tree57dbed17f96056685267145179cc17688c3d4dbf /addons/analytic_user_function/analytic_user_function_view.xml
parentdbfa9fbf7ea2167fd1a849ade24a39fb81b0719b (diff)
parent5e7f13205546b7100e05e41c45f5740355fb28b0 (diff)
[MERGE]merge with trunk n resolve conflicts
bzr revid: sgo@tinyerp.com-20120727050907-ukg860or3629i223
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions