diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-07-14 18:06:00 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-07-14 18:06:00 -0300 |
| commit | 97232dd346b6e959675def22596d034100d6e91b (patch) | |
| tree | f6f6eb1b945ac0a7c467277852fad4bd144a024d /Makefile | |
| parent | 8c091e9d59baa808a7853e3fa7a570ee94b9375d (diff) | |
| parent | 046d35bac04022eab343e9e6e40a3056c5e653ad (diff) | |
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.07.14
Conflicts:
PKGBUILD
rc.sysinit
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions