Merge lp://staging/~wolfer7/cairoplot/trunk into lp://staging/cairoplot
Proposed by
wolfer
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~wolfer7/cairoplot/trunk |
| Merge into: | lp://staging/cairoplot |
| Diff against target: |
7253 lines (+5048/-2093) (has conflicts) 22 files modified
.bzrignore (+140/-0) COPYING (+504/-0) ChangeLog (+134/-0) MANIFEST (+7/-0) NEWS (+19/-0) TODO (+18/-0) cairoplot/__init__.py (+377/-0) cairoplot/handlers.py (+121/-0) cairoplot/plots.py (+2025/-0) cairoplot/series.py (+1140/-0) gtktests.py (+25/-0) seriestests.py (+265/-0) setup.py (+19/-0) tests.py (+254/-0) trunk/COPYING (+0/-504) trunk/ChangeLog (+0/-134) trunk/MANIFEST (+0/-7) trunk/NEWS (+0/-19) trunk/TODO (+0/-18) trunk/series.py (+0/-1140) trunk/setup.py (+0/-19) trunk/tests.py (+0/-252) Conflict: can't delete trunk because it is not empty. Not deleting. Conflict because trunk is not versioned, but has versioned children. Versioned directory. Contents conflict in trunk/cairoplot.py Contents conflict in trunk/seriestests.py |
| To merge this branch: | bzr merge lp://staging/~wolfer7/cairoplot/trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Rodrigo Moreira Araújo | Pending | ||
|
Review via email:
|
|||
Description of the change
current cairoplot trunk (rev41) + lp:~tswast/cairoplot/trunk + some refactoring + some fixes for the gtk handler + label formatters (lp:~mrooney/cairoplot/label-formatters) + labelformatters for dotlineplot
To post a comment you must log in.
Unmerged revisions
- 60. By wolfer
-
- added option to show values in pie charts and donut charts
- fixed tests - 59. By wolfer
-
labelformatters for dotlineplot
- 58. By wolfer
-
merged label-formatters from lp:~mrooney/cairoplot/label-formatters
- 57. By Wolfgang Steitz <email address hidden>
-
improve gtk handler
- 56. By wolfgang steitz <wolfer@IBWKA1>
-
fix gtktests
- 55. By wolfgang steitz <wolfer@IBWKA1>
-
refactor
- 54. By wolfgang steitz <wolfer@IBWKA1>
-
changed file permissions. small improvements for the gtk handler
- 53. By wolfgang steitz <wolfer@IBWKA1>
-
merged Karel Kolman's speed up branch
- 52. By wolfgang steitz <wolfer@IBWKA1>
-
changed folder structure
- 51. By wolfgang steitz <wolfer@IBWKA1>
-
refactor to move code out of __init__
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
