diff options
author | Ron Yorston <rmy@pobox.com> | 2021-12-27 08:21:55 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2021-12-27 08:21:55 +0000 |
commit | b15f68214da209b5b293039c09c00f490c0cc193 (patch) | |
tree | d644b5d9318b79cb1baa356cbb63318cc4872c05 /Makefile | |
parent | 1ee308c75f4720ee38be8e81ff8c9ed4c52670d4 (diff) | |
parent | 44075929a8b9c1861d15564fa6ac4562abb724d7 (diff) | |
download | busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.tar.gz busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.tar.bz2 busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.zip |
Merge busybox into merge
Fix merge conflict in coreutils/timeout.c.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ | |||
1 | VERSION = 1 | 1 | VERSION = 1 |
2 | PATCHLEVEL = 35 | 2 | PATCHLEVEL = 36 |
3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
4 | EXTRAVERSION = .git | 4 | EXTRAVERSION = .git |
5 | NAME = Unnamed | 5 | NAME = Unnamed |