diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-21 15:06:40 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-08-21 15:06:40 -0300 |
| commit | 2fb1be996d4d8d459f4b4953a84af63f981b0bf0 (patch) | |
| tree | f168040a0fc7e8e61c93197354938d95454e12a9 /.gitignore | |
| parent | abbce1c6720dc3836c1df1337a49768158dff62b (diff) | |
| parent | 7e019c49b21cf2e975ff7d8b2bedf3bb2477d1c6 (diff) | |
Merge branch 'master' of git://projects.archlinux.org/initscripts2012.08.21
Conflicts:
Makefile
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -4,5 +4,8 @@ hostname.5 locale.conf.5 vconsole.conf.5 rc.conf.5 +archlinux.7 +arch-daemons.8 +arch-modules-load.8 rc.d.8 pkg/ |