Merge lp:~openerp-dev/openobject-client/trunk-compatible_with_py2.6-rga into lp:openobject-client
Proposed by
Ravi Gadhia (OpenERP)
Status: | Merged |
---|---|
Merged at revision: | 2005 |
Proposed branch: | lp:~openerp-dev/openobject-client/trunk-compatible_with_py2.6-rga |
Merge into: | lp:openobject-client |
Diff against target: |
224 lines (+51/-34) 6 files modified
bin/SpiffGtkWidgets/Calendar/Calendar.py (+1/-1) bin/SpiffGtkWidgets/Calendar/CanvasDay.py (+3/-1) bin/SpiffGtkWidgets/Calendar/CanvasRectangle.py (+12/-11) bin/widget/view/calendar_gtk/parser.py (+0/-2) bin/widget/view/diagram_gtk/xdot.py (+8/-2) setup.py (+27/-17) |
To merge this branch: | bzr merge lp:~openerp-dev/openobject-client/trunk-compatible_with_py2.6-rga |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Naresh(OpenERP) | Approve | ||
Review via email: mp+80790@code.launchpad.net |
To post a comment you must log in.