[OE-core] [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN}

[Richard Purdie]

On Sat, 2012-06-16 at 20:08 +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>  meta/recipes-connectivity/openssh/openssh_6.0p1.bb |    4 ++--
>  meta/recipes-core/gettext/gettext_0.18.1.1.bb      |    4 ++--
>  .../xorg-proto/compositeproto_0.4.2.bb             |    4 ++--
>  .../xorg-proto/damageproto_1.2.1.bb                |    4 ++--
>  meta/recipes-graphics/xorg-proto/fixesproto_5.0.bb |    4 ++--
>  .../xorg-proto/randrproto_1.3.2.bb                 |    4 ++--
>  .../xorg-proto/recordproto_1.14.2.bb               |    4 ++--
>  .../xorg-proto/renderproto_0.11.1.bb               |    4 ++--
>  .../xorg-proto/resourceproto_1.2.0.bb              |    4 ++--
>  .../xorg-proto/xf86dgaproto_2.1.bb                 |    4 ++--
>  .../xorg-proto/xf86vidmodeproto_2.3.1.bb           |    4 ++--
>  .../matchbox-desktop-sato_git.bb                   |    4 ++--
>  meta/recipes-support/db/db_5.3.15.bb               |    4 ++--
>  13 files changed, 26 insertions(+), 26 deletions(-)

Merged to master along with 2/2, thanks.

Richard