diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:18:07 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:18:07 +0200 |
| commit | 4882a074aac789c688d8ccc444f7cd57d775fe8a (patch) | |
| tree | 5b88be0fd3b5a3ce3efb6eeed8eb4f7144573a17 | |
| parent | 2dd6d1fc82c0563c0b3af90ad4926fa6463c204f (diff) | |
resolve merge conflict
| -rw-r--r-- | package/jpeg/patches/patch-ltmain_sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/package/jpeg/patches/patch-ltmain_sh b/package/jpeg/patches/patch-ltmain_sh index dbc41c774..9ac6b5178 100644 --- a/package/jpeg/patches/patch-ltmain_sh +++ b/package/jpeg/patches/patch-ltmain_sh @@ -1,9 +1,5 @@ --- jpeg-8c.orig/ltmain.sh 2010-11-17 22:41:29.000000000 +0100 -<<<<<<< HEAD +++ jpeg-8c/ltmain.sh 2011-04-07 11:28:48.000000000 +0200 -======= -+++ jpeg-8c/ltmain.sh 2011-04-01 17:20:27.503069018 +0200 ->>>>>>> 62cd6b2635b1e0d233c8537a008bc823c4cd4b2c @@ -5840,7 +5840,7 @@ func_mode_link () # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |