diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
| commit | 2dd6d1fc82c0563c0b3af90ad4926fa6463c204f (patch) | |
| tree | cea2d78836b0958b0402b42976c4c84ec6e700a8 /package/jpeg | |
| parent | c82f34b5a8e2851c2074c1e03263f788eb2c28be (diff) | |
| parent | 3cda7c5f211225fea03a3634daeef9cafd627aa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/firefox/Makefile
package/jpeg/patches/patch-ltmain_sh
Diffstat (limited to 'package/jpeg')
| -rw-r--r-- | package/jpeg/patches/patch-ltmain_sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/package/jpeg/patches/patch-ltmain_sh b/package/jpeg/patches/patch-ltmain_sh index 9ac6b5178..dbc41c774 100644 --- a/package/jpeg/patches/patch-ltmain_sh +++ b/package/jpeg/patches/patch-ltmain_sh @@ -1,5 +1,9 @@ --- 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*| \ |