diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-31 22:15:17 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-31 22:15:17 -0300 |
| commit | a1642a5964035040dcbf07af01418375e45bb128 (patch) | |
| tree | eaccd090fe7f046a241d9897544b2354a36b8a80 /rc.d | |
| parent | 2fb1be996d4d8d459f4b4953a84af63f981b0bf0 (diff) | |
| parent | c67d598d1cb2c346c83b72449bf20ee5dfea9ae7 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.09.1
Conflicts:
Makefile
parabola.7.txt
Diffstat (limited to 'rc.d')
0 files changed, 0 insertions, 0 deletions