Merge lp://qastaging/~lfaraone/ubuntu/maverick/memtest86+/4.10-1ubuntu1 into lp://qastaging/ubuntu/maverick/memtest86+
Proposed by
Luke Faraone
| Status: | Merged |
|---|---|
| Merge reported by: | Benjamin Drung |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~lfaraone/ubuntu/maverick/memtest86+/4.10-1ubuntu1 |
| Merge into: | lp://qastaging/ubuntu/maverick/memtest86+ |
| Diff against target: |
1868 lines (+1227/-88) 34 files modified
Makefile (+6/-1) README (+1/-1) changelog (+9/-17) controller.c (+269/-3) debian/README.Debian (+12/-6) debian/changelog (+59/-0) debian/config (+9/-0) debian/control (+6/-5) debian/copyright (+3/-2) debian/grub (+34/-12) debian/lintian-overrides (+3/-0) debian/po/POTFILES.in (+1/-0) debian/po/de.po (+37/-0) debian/po/es.po (+58/-0) debian/po/fr.po (+38/-0) debian/po/ja.po (+35/-0) debian/po/pt.po (+37/-0) debian/po/ru.po (+37/-0) debian/po/sv.po (+37/-0) debian/po/templates.pot (+32/-0) debian/postinst (+9/-12) debian/rules (+9/-1) debian/templates (+7/-0) head.S (+74/-1) init.c (+56/-11) lib.c (+3/-3) main.c (+11/-4) makeiso.sh (+3/-3) memsize.c (+1/-1) memtest.lds (+1/-1) mt86+_loader.asm (+2/-2) multiboot.c (+49/-0) multiboot.h (+259/-0) test.h (+20/-2) |
| To merge this branch: | bzr merge lp://qastaging/~lfaraone/ubuntu/maverick/memtest86+/4.10-1ubuntu1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Sponsors | 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
