diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-09-13 21:54:55 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-09-13 21:54:55 -0300 |
| commit | b11fa2ad388eaaa3776a3d3c99fb30d6ddb111b0 (patch) | |
| tree | c5386f2d16ed5ff4170f4915fbf07c6f478f8599 /TODO | |
| parent | 64a660adb9a1ad658874759c186e0e9cbf138e63 (diff) | |
| parent | 0d04c89e6bfee46477ef08030654a0b421ba86ae (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/archiso
Conflicts:
README
archiso/mkarchiso
configs/baseline/build.sh
configs/baseline/syslinux/syslinux.cfg
configs/releng/build.sh
configs/releng/packages.i686
configs/releng/packages.x86_64
configs/releng/root-image/etc/arch-release
configs/releng/root-image/etc/hosts
configs/releng/root-image/etc/issue
configs/releng/root-image/etc/motd
configs/releng/root-image/etc/rc.conf
configs/releng/root-image/libre/report-issues
configs/releng/root-image/libre/setup
configs/releng/syslinux.dual/archiso_head.cfg
configs/releng/syslinux.dual/archiso_sys32.cfg
configs/releng/syslinux.dual/archiso_sys64.cfg
configs/releng/syslinux.dual/archiso_tail.cfg
configs/releng/syslinux/syslinux.cfg
Diffstat (limited to 'TODO')
0 files changed, 0 insertions, 0 deletions