diff options
| author | Olivier Dony <odo@openerp.com> | 2011-08-10 01:44:28 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2011-08-10 01:44:28 +0200 |
| commit | 50507512cbaf6d0119a29943c9ca85deb4057404 (patch) | |
| tree | 05f66487a913e409b4b4bf055a55e2cd79ddc9ba /addons/web_graph/static/lib/dhtmlxGraph/codebase | |
| parent | 3e6b0297d02168de2194e71e80f60774603c3634 (diff) | |
| parent | 097b76d372c77f5cc006cda7a86c623fcc89b8df (diff) | |
[MERGE] latest trunk
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.
bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
Diffstat (limited to 'addons/web_graph/static/lib/dhtmlxGraph/codebase')
0 files changed, 0 insertions, 0 deletions