Merge lp://staging/~xnox/ubuntu-seeds/drop-ndis-xubuntu.raring into lp://staging/~ubuntu-core-dev/ubuntu-seeds/ubuntu.raring
Proposed by
Dimitri John Ledkov
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~xnox/ubuntu-seeds/drop-ndis-xubuntu.raring |
| Merge into: | lp://staging/~ubuntu-core-dev/ubuntu-seeds/ubuntu.raring |
| Diff against target: |
726 lines (+324/-38) (has conflicts) 11 files modified
STRUCTURE (+11/-0) blacklist (+9/-0) desktop (+184/-4) dns-server (+0/-7) lamp-server (+0/-10) live (+31/-3) postgresql-server (+0/-14) ship (+42/-0) ship-live (+13/-0) supported (+33/-0) supported-desktop-extra (+1/-0) Text conflict in STRUCTURE Text conflict in desktop Contents conflict in development Contents conflict in doc/langpacks.txt Text conflict in live Contents conflict in mail-server Contents conflict in openssh-server Contents conflict in print-server Contents conflict in samba-server Contents conflict in server-ship Text conflict in ship Text conflict in ship-live Text conflict in supported Conflict adding file supported-desktop-extra. Moved existing file to supported-desktop-extra.moved. |
| To merge this branch: | bzr merge lp://staging/~xnox/ubuntu-seeds/drop-ndis-xubuntu.raring |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Core Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
Drop ndiswrapper utils & gui, kernel module not shipped
To post a comment you must log in.
Unmerged revisions
- 929. By Dimitri John Ledkov
-
Drop ndiswrapper utils & gui, kernel module not shipped
- 928. By Colin Watson
-
platform.quantal -> platform.raring
- 927. By Micah Gersten
-
* Drop de from i386, not enough space
- 926. By Micah Gersten
-
* Switch xh and pt back from just i386 to !powerpc since we have room again
- 925. By Micah Gersten
-
* Drop aisleriot due to space concerns
- 924. By Micah Gersten
-
* Add back de on i386 to live image, should be enough space
- 923. By Micah Gersten
-
* Drop pt from amd64, lack of space
- 922. By Lionel Le Folgoc
-
restore indicator-sound by default
- 921. By Micah Gersten
-
* Reenable the indicator stuff that is already in the archive
- 920. By Micah Gersten
-
* Drop gnumeric for now due to space concerns
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
