diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
| commit | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (patch) | |
| tree | f5ec7ac45234c25794c97f87e9a6daa8a551e57c /editors | |
| parent | 72394258b6509b40e0fa08594ac86215a558dfd8 (diff) | |
| parent | 8d0e0cdadf726beab28ccdc7d69738c1534e1f74 (diff) | |
| download | busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.gz busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.bz2 busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.zip | |
Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge
Conflicts:
include/platform.h
libbb/Kbuild.src
libbb/messages.c
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/patch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/patch.c b/editors/patch.c index 9c6d967b9..a90252a03 100644 --- a/editors/patch.c +++ b/editors/patch.c | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | * [file] which file to patch | 21 | * [file] which file to patch |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | //applet:IF_PATCH(APPLET(patch, _BB_DIR_USR_BIN, _BB_SUID_DROP)) | 24 | //applet:IF_PATCH(APPLET(patch, BB_DIR_USR_BIN, BB_SUID_DROP)) |
| 25 | 25 | ||
| 26 | //kbuild:lib-$(CONFIG_PATCH) += patch.o | 26 | //kbuild:lib-$(CONFIG_PATCH) += patch.o |
| 27 | 27 | ||