diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-01-23 09:50:40 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-01-23 09:50:40 +0000 |
| commit | 63dbf1908bc51918d9d963f4d9b7657306b2970d (patch) | |
| tree | 781ebfdcbbb953688e06f3541ce9e0c71f1dadfa /Makefile | |
| parent | 06900749637b925af1ebdf5030ba03a379f4f84f (diff) | |
| parent | 6968e081230fb6434a2a6f0eed39d538ea982f3f (diff) | |
| download | busybox-w32-TIG_1_23_0.tar.gz busybox-w32-TIG_1_23_0.tar.bz2 busybox-w32-TIG_1_23_0.zip | |
Merge commit '1_23_0' into mergeTIG_1_23_0
Conflicts:
libbb/lineedit.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 1 | 1 | VERSION = 1 |
| 2 | PATCHLEVEL = 23 | 2 | PATCHLEVEL = 23 |
| 3 | SUBLEVEL = 0 | 3 | SUBLEVEL = 0 |
| 4 | EXTRAVERSION = .git | 4 | EXTRAVERSION = |
| 5 | NAME = Unnamed | 5 | NAME = Unnamed |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |