diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-03-14 20:33:00 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-03-14 20:33:00 +0000 |
| commit | a4f58436b78fe59e57620c6e0301f213ee25f273 (patch) | |
| tree | 8355f724926e605280af2d6f2b1ccc6b1bd02dee /.gitignore | |
| parent | ba0c36cfcf84efbac6f89e27238e04bb57e9cd45 (diff) | |
| parent | 49acc1a7618a28d34381cbb7661d7c981fcb238f (diff) | |
| download | busybox-w32-a4f58436b78fe59e57620c6e0301f213ee25f273.tar.gz busybox-w32-a4f58436b78fe59e57620c6e0301f213ee25f273.tar.bz2 busybox-w32-a4f58436b78fe59e57620c6e0301f213ee25f273.zip | |
Merge branch 'busybox' into merge
Conflicts:
coreutils/od_bloaty.c
libbb/lineedit.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 01400a678..2a7f2f79b 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -43,3 +43,11 @@ core | |||
| 43 | /busybox.links | 43 | /busybox.links |
| 44 | /runtest-tempdir-links | 44 | /runtest-tempdir-links |
| 45 | /testsuite/echo-ne | 45 | /testsuite/echo-ne |
| 46 | |||
| 47 | # | ||
| 48 | # cscope output | ||
| 49 | # | ||
| 50 | cscope.files | ||
| 51 | cscope.in.out | ||
| 52 | cscope.out | ||
| 53 | cscope.po.out | ||