diff options
| author | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
|---|---|---|
| committer | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
| commit | a5139a6e4ed897d59c900d8ea991c60a19d01862 (patch) | |
| tree | f82a2c95fe0f34ddf5e7e4d88bfa33548e8269a8 /configs/releng/syslinux/parabolaiso.cfg | |
| parent | 2ad1f4471698f00cc3985437f461e2e17aeccfa3 (diff) | |
| parent | 491b627eb4b6af909ba8e19751378672930328eb (diff) | |
Merge branch 'master' of archiso into helper/rebrandhelper/rebrand
Conflicts:
Makefile
configs/releng/build.sh
configs/releng/mkinitcpio.conf
configs/releng/root-image/root/customize_root_image.sh
configs/releng/syslinux/parabolaiso_pxe32.cfg
configs/releng/syslinux/parabolaiso_pxe64.cfg
configs/releng/syslinux/parabolaiso_sys32.cfg
configs/releng/syslinux/parabolaiso_sys64.cfg
docs/README.build
parabolaiso/mkparabolaiso
Diffstat (limited to 'configs/releng/syslinux/parabolaiso.cfg')
0 files changed, 0 insertions, 0 deletions