Photostory

Merge lp://staging/~joshbrown/photostory/datafiles into lp://staging/~photostory/photostory/trunk

  1. datafiles
  2. Merge into trunk
Proposed by Josh Brown
Status: Merged
Merge reported by: Josh Brown
Merged at revision: not available
Proposed branch: lp://staging/~joshbrown/photostory/datafiles
Merge into: lp://staging/~photostory/photostory/trunk
Diff against target: 260 lines (+45/-71) (has conflicts)
6 files modified
MANIFEST (+5/-0)
data/db (+0/-2)
data/num (+0/-2)
install.diff (+4/-44)
photostory (+34/-19)
setup.py (+2/-4)
Text conflict in MANIFEST
To merge this branch: bzr merge lp://staging/~joshbrown/photostory/datafiles
Reviewer Review Type Date Requested Status
Joel Auterson Pending
Review via email: mp+32791@code.staging.launchpad.net
To post a comment you must log in.
lp://staging/~joshbrown/photostory/datafiles updated
19. By Josh Brown

Changed all instances of `picture` to `photo`.

Revision history for this message
Josh Brown (joshbrown) wrote :

Since there hasn't been any activity for a while, I'm going to go ahead and merge this.

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: