Merge lp://staging/~logan/ubuntu/raring/zoneminder/1.25.0-4ubuntu1 into lp://staging/ubuntu/raring/zoneminder
Proposed by
Logan Rosen
| Status: | Merged |
|---|---|
| Merged at revision: | 26 |
| Proposed branch: | lp://staging/~logan/ubuntu/raring/zoneminder/1.25.0-4ubuntu1 |
| Merge into: | lp://staging/ubuntu/raring/zoneminder |
| Diff against target: |
212 lines (+48/-86) 9 files modified
.pc/applied-patches (+1/-0) debian/changelog (+19/-0) debian/control (+1/-1) debian/patches/03_no_phone_home.dpatch (+0/-19) debian/patches/07_fix_ffmpeg_defaults.dpatch (+0/-19) debian/patches/cve-2013-0232 (+23/-0) debian/patches/fix-32bit-types (+0/-42) debian/patches/series (+1/-3) web/includes/functions.php (+3/-2) |
| To merge this branch: | bzr merge lp://staging/~logan/ubuntu/raring/zoneminder/1.25.0-4ubuntu1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Good work.