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/mplayer/patches/patch-configure | |
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/mplayer/patches/patch-configure')
-rw-r--r-- | package/mplayer/patches/patch-configure | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure index eb33a8720..2fe0e1e10 100644 --- a/package/mplayer/patches/patch-configure +++ b/package/mplayer/patches/patch-configure @@ -1,6 +1,6 @@ ---- mplayer-1.0-32749.orig/configure 2011-01-03 11:27:11.000000000 +0100 -+++ mplayer-1.0-32749/configure 2011-01-09 00:35:20.000000000 +0100 -@@ -2554,7 +2554,7 @@ else +--- MPlayer-1.0rc4.orig/configure 2010-07-29 02:31:57.000000000 +0200 ++++ MPlayer-1.0rc4/configure 2011-04-01 16:12:17.224319163 +0200 +@@ -2556,7 +2556,7 @@ else fi cflag_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer" |