diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-12-14 14:20:56 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-12-14 14:20:56 +0000 |
| commit | 6d6d18d45c145899fce3a39553771cf0af671f30 (patch) | |
| tree | 1936d18cbf61b9e0989464aad0a11c52cbeff7b7 /.gitignore | |
| parent | 0c204dc07b718244c360e0b84df66ce0a012e14f (diff) | |
| parent | acb8be721768b54075a51d1859d390904a0f1f6c (diff) | |
| download | busybox-w32-6d6d18d45c145899fce3a39553771cf0af671f30.tar.gz busybox-w32-6d6d18d45c145899fce3a39553771cf0af671f30.tar.bz2 busybox-w32-6d6d18d45c145899fce3a39553771cf0af671f30.zip | |
Merge branch 'busybox' into merge
Conflicts:
archival/libarchive/open_transformer.c
libbb/lineedit.c
miscutils/man.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index cae1d53dd..01400a678 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -42,3 +42,4 @@ core | |||
| 42 | # | 42 | # |
| 43 | /busybox.links | 43 | /busybox.links |
| 44 | /runtest-tempdir-links | 44 | /runtest-tempdir-links |
| 45 | /testsuite/echo-ne | ||