diff options
author | Tom Gundersen <teg@jklm.no> | 2011-06-05 01:57:31 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2011-06-05 01:57:31 +0200 |
commit | 0dfd69b9e8617ef15413e5022442017603be5344 (patch) | |
tree | 7d03111e655e14529f62d5d1041f6f3d0069eecf /.gitignore | |
parent | 66f7acdc789099114945f08c92c9957f7e536f2d (diff) | |
parent | d847a204aa5ab21a6c02998846ec3216cc7f887d (diff) | |
download | initscripts-0dfd69b9e8617ef15413e5022442017603be5344.tar.xz |
Merge remote-tracking branch 'falconindy/working'
Conflicts:
rc.sysinit
Conflict with ip move away from /usr
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions