diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
| commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
| tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /package/dropbear/patches/patch-cli-runopts_c | |
| parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
| parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) | |
fix conflict
Diffstat (limited to 'package/dropbear/patches/patch-cli-runopts_c')
| -rw-r--r-- | package/dropbear/patches/patch-cli-runopts_c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/dropbear/patches/patch-cli-runopts_c b/package/dropbear/patches/patch-cli-runopts_c index 46e03dfca..b2f98da81 100644 --- a/package/dropbear/patches/patch-cli-runopts_c +++ b/package/dropbear/patches/patch-cli-runopts_c @@ -1,7 +1,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- dropbear-0.52.orig/cli-runopts.c 2008-11-11 15:09:02.000000000 +0100 -+++ dropbear-0.52/cli-runopts.c 2009-03-19 19:20:16.000000000 +0100 -@@ -271,6 +271,10 @@ void cli_getopts(int argc, char ** argv) +--- dropbear-0.53.1.orig/cli-runopts.c 2011-03-02 14:23:35.000000000 +0100 ++++ dropbear-0.53.1/cli-runopts.c 2011-08-02 20:03:12.000000000 +0200 +@@ -287,6 +287,10 @@ void cli_getopts(int argc, char ** argv) debug_trace = 1; break; #endif @@ -12,7 +12,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ case 'F': case 'e': case 'c': -@@ -282,7 +286,6 @@ void cli_getopts(int argc, char ** argv) +@@ -298,7 +302,6 @@ void cli_getopts(int argc, char ** argv) #ifndef ENABLE_CLI_LOCALTCPFWD case 'L': #endif |