« back to all changes in this revision
Viewing changes to d-i/source/base-installer/kernel/tests/i386/pentium-4M-bigmem-2.test
- Committer: Cody Garver
- Date: 2016-02-17 19:28:41 UTC
- mfrom: (1.1.5 ubiquity-xenial)
- Revision ID: cody@elementary.io-20160217192841-pf0qnoqxqsw7pcmb
Merge in lp:~elementary-os/ubuntu-package-imports/ubiquity-xenial and resolve conflicts
- files added:
- d-i/source/apt-setup/debian/po/tg.po
- d-i/source/apt-setup/debian/source
- d-i/source/apt-setup/release-files/archive.canonical.com/xenial
- d-i/source/apt-setup/release-files/archive.canonical.com/xenial-proposed
- d-i/source/apt-setup/release-files/archive.ubuntu.com/xenial
- d-i/source/apt-setup/release-files/archive.ubuntu.com/xenial-backports
- d-i/source/apt-setup/release-files/archive.ubuntu.com/xenial-proposed
- d-i/source/apt-setup/release-files/archive.ubuntu.com/xenial-updates
- d-i/source/apt-setup/release-files/ports.ubuntu.com
- d-i/source/apt-setup/release-files/ports.ubuntu.com/xenial
- d-i/source/apt-setup/release-files/ports.ubuntu.com/xenial-backports
- d-i/source/apt-setup/release-files/ports.ubuntu.com/xenial-proposed
- d-i/source/apt-setup/release-files/ports.ubuntu.com/xenial-updates
- d-i/source/apt-setup/release-files/security.ubuntu.com/xenial-security
- d-i/source/grub-installer/debian/source
- d-i/source/user-setup/debian/source
- files removed:
- d-i/apt
- d-i/apt/cache
- d-i/apt/cache/archives
- d-i/apt/cache/archives/partial
- d-i/apt/state
- d-i/apt/state/lists
- d-i/apt/state/lists/partial
- d-i/source/apt-setup/release-files/archive.canonical.com/saucy
- d-i/source/apt-setup/release-files/archive.ubuntu.com/saucy
- d-i/source/apt-setup/release-files/archive.ubuntu.com/saucy-backports
- d-i/source/apt-setup/release-files/archive.ubuntu.com/saucy-proposed
- d-i/source/apt-setup/release-files/archive.ubuntu.com/saucy-updates
- d-i/source/apt-setup/release-files/security.ubuntu.com/saucy-security
- d-i/source/base-installer/kernel/tests/s390
- d-i/source/partman-auto/recipes-mips-sb1-bcm91250a
- d-i/source/partman-auto/recipes-mips-sb1a-bcm91480b
- d-i/source/partman-auto/recipes-mipsel-sb1-bcm91250a
- d-i/source/partman-auto/recipes-mipsel-sb1a-bcm91480b
- files modified:
- d-i/manifest
- d-i/source/hw-detect/hw-detect.pre-pkgsel.d/50install-firmware *
added
removed
d-i/source/base-installer/kernel/tests/i386/pentium-4M-bigmem-2.test
