summaryrefslogtreecommitdiff
path: root/configs/baseline/mkinitcpio.conf
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-07-20 16:01:16 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-07-20 16:01:16 -0300
commit1a87fac19da7cf748c7f42d1ec183cff00998016 (patch)
treee1754bf58be446c0612a0460abae9cf879f29fa2 /configs/baseline/mkinitcpio.conf
parentfea6291aff50468dd0f1e40c85d6d9ee7ca972a2 (diff)
parent27e472451e39bcec4b785101d2964e6d5f8a91d5 (diff)
Merge branch 'master' of https://projects.archlinux.org/git/archiso
Conflicts: README configs/baseline/build.sh configs/releng/build.sh configs/releng/packages.i686 configs/releng/packages.x86_64 configs/releng/root-image/etc/rc.d/archiso
Diffstat (limited to 'configs/baseline/mkinitcpio.conf')
0 files changed, 0 insertions, 0 deletions