Merge lp://staging/~noskcaj/ubuntu/vivid/taoframework/merge into lp://staging/ubuntu/vivid/taoframework
Proposed by
Jackson Doak
| Status: | Merged |
|---|---|
| Approved by: | Sebastien Bacher |
| Approved revision: | 22 |
| Merge reported by: | Sebastien Bacher |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~noskcaj/ubuntu/vivid/taoframework/merge |
| Merge into: | lp://staging/ubuntu/vivid/taoframework |
| Diff against target: |
205 lines (+54/-31) 12 files modified
.pc/.quilt_patches (+1/-0) .pc/.quilt_series (+1/-0) .pc/.version (+1/-0) debian/changelog (+20/-0) debian/control (+3/-3) debian/patches/200_libSDL_gfx_update.diff (+0/-11) debian/patches/200_libavcodec_update.diff (+4/-4) debian/patches/200_libavformat_update (+4/-4) debian/patches/200_libavutil_update.diff (+4/-4) debian/patches/200_libswscale_update (+4/-4) debian/patches/series (+1/-1) debian/patches/update_Tao.Sdl_dllmap.patch (+11/-0) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/vivid/taoframework/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastien Bacher | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian. nunit transition
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
thanks