Merge lp://staging/~asbjornenge/pyjasperclient/devel into lp://staging/pyjasperclient

Proposed by agaoglu
Status: Merged
Approved by: agaoglu
Approved revision: 4
Merged at revision: 4
Proposed branch: lp://staging/~asbjornenge/pyjasperclient/devel
Merge into: lp://staging/pyjasperclient
Diff against target: 73 lines (+32/-2) (has conflicts)
3 files modified
pyjasperclient/__init__.py (+1/-0)
pyjasperclient/jasperclient.py (+20/-2)
setup.py (+11/-0)
Text conflict in pyjasperclient/jasperclient.py
To merge this branch: bzr merge lp://staging/~asbjornenge/pyjasperclient/devel
Reviewer Review Type Date Requested Status
agaoglu Approve
Review via email: mp+67889@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
agaoglu (agaoglu) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: