summaryrefslogtreecommitdiff
path: root/rc.conf.5.txt
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-08-21 15:06:40 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-08-21 15:06:40 -0300
commit2fb1be996d4d8d459f4b4953a84af63f981b0bf0 (patch)
treef168040a0fc7e8e61c93197354938d95454e12a9 /rc.conf.5.txt
parentabbce1c6720dc3836c1df1337a49768158dff62b (diff)
parent7e019c49b21cf2e975ff7d8b2bedf3bb2477d1c6 (diff)
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.08.21
Conflicts: Makefile
Diffstat (limited to 'rc.conf.5.txt')
0 files changed, 0 insertions, 0 deletions