diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-06-12 22:21:07 +0200 |
| commit | c326ad5a1960df22c5efd71bd815b9b12688556e (patch) | |
| tree | 09bd868c4446f3510a070ed601e7b67c6b791cde /recipes/mplayer | |
| parent | dd0fdfe9ed922189f4251c688b7a16faa76cd904 (diff) | |
| parent | 2bca6bd1a15123af28ff5ef8fd6ebb417a3a4dee (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Conflicts:
recipes/tgt/tgt_1.0.5.bb
Diffstat (limited to 'recipes/mplayer')
| -rw-r--r-- | recipes/mplayer/mplayer_0.0+1.0rc1.bb | 2 | ||||
| -rw-r--r-- | recipes/mplayer/mplayer_0.0+1.0rc2.bb | 2 | ||||
| -rw-r--r-- | recipes/mplayer/mplayer_git.bb | 2 | ||||
| -rw-r--r-- | recipes/mplayer/mplayer_svn.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/recipes/mplayer/mplayer_0.0+1.0rc1.bb b/recipes/mplayer/mplayer_0.0+1.0rc1.bb index 28967ccb7d..5f023942a8 100644 --- a/recipes/mplayer/mplayer_0.0+1.0rc1.bb +++ b/recipes/mplayer/mplayer_0.0+1.0rc1.bb @@ -41,7 +41,7 @@ ARM_INSTRUCTION_SET = "ARM" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r18" +PR = "r19" PARALLEL_MAKE = "" diff --git a/recipes/mplayer/mplayer_0.0+1.0rc2.bb b/recipes/mplayer/mplayer_0.0+1.0rc2.bb index 5adf23827d..78512f54c3 100644 --- a/recipes/mplayer/mplayer_0.0+1.0rc2.bb +++ b/recipes/mplayer/mplayer_0.0+1.0rc2.bb @@ -46,7 +46,7 @@ ARM_INSTRUCTION_SET = "ARM" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r14" +PR = "r15" PARALLEL_MAKE = "" diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb index 49124e27d1..e57ef843b6 100644 --- a/recipes/mplayer/mplayer_git.bb +++ b/recipes/mplayer/mplayer_git.bb @@ -35,7 +35,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc4+gitr${SRCPV}" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_shr = "2" diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index c197d67468..af20c91ce0 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -40,7 +40,7 @@ RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" PV = "0.0+1.0rc3+svnr${SRCPV}" -PR = "r20" +PR = "r21" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" DEFAULT_PREFERENCE_shr = "1" |