diff options
| author | Esteban Carnevale <alfplayer@mailoo.org> | 2012-10-14 15:11:11 -0300 |
|---|---|---|
| committer | Esteban Carnevale <alfplayer@mailoo.org> | 2012-10-14 15:11:11 -0300 |
| commit | e5edfc111b1e9fc5ec65696245e6cbd96b2af1e4 (patch) | |
| tree | 07bdb2e27180c632ad827b400af44695d7c5a15f /configs/releng/syslinux/archiso_pxe.cfg | |
| parent | 4b38c919cbb133c35a06b330e8de9f305c5b4792 (diff) | |
| parent | 753d2038024541ac2d10f74e6d408d6ed1a23f2a (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/archiso
Conflicts:
README
configs/releng/build.sh
configs/releng/efiboot/EFI/boot/startup_iso.nsh
configs/releng/efiboot/EFI/boot/startup_usb.nsh
configs/releng/packages.i686
configs/releng/packages.x86_64
configs/releng/root-image/etc/rc.conf
configs/releng/root-image/etc/rc.d/pacman-init
Diffstat (limited to 'configs/releng/syslinux/archiso_pxe.cfg')
0 files changed, 0 insertions, 0 deletions