diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
| commit | 40514a0309939f2446f0d4ed9600cad5de396e7f (patch) | |
| tree | 0f5f4a57d4bb7893418b5bb11d482858eb17ba8b /Makefile | |
| parent | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (diff) | |
| parent | c0cae52662ccced9df19f19ec94238d1b1e3bd71 (diff) | |
| download | busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.gz busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.bz2 busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.zip | |
Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge
Conflicts:
Makefile.flags
scripts/basic/fixdep.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 1 | 1 | VERSION = 1 |
| 2 | PATCHLEVEL = 19 | 2 | PATCHLEVEL = 20 |
| 3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
| 4 | EXTRAVERSION = | 4 | EXTRAVERSION = .git |
| 5 | NAME = Unnamed | 5 | NAME = Unnamed |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |