Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN}
Date: Mon, 18 Jun 2012 13:42:19 +0100	[thread overview]
Message-ID: <1340023339.8481.22.camel@ted> (raw)
In-Reply-To: <1339870099-24648-1-git-send-email-Martin.Jansa@gmail.com>

On Sat, 2012-06-16 at 20:08 +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@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




      parent reply	other threads:[~2012-06-18 12:53 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-08 18:02 CONFLICTS as keyword or just misspelled RCONFLICTS? Martin Jansa
2012-05-08 19:20 ` Mark Hatle
2012-05-08 19:25   ` Peter Seebach
2012-06-16  6:51     ` Martin Jansa
2012-07-07  8:31       ` [PATCH] conf/machine: replace TUNE_CONFLICTS with TUNECONFLICTS Martin Jansa
2012-07-17 15:09         ` Saul Wold
2012-06-16 18:08 ` [PATCH 1/2] recipes: replace CONFLICTS with RCONFLICTS_${PN} Martin Jansa
2012-06-16 18:08   ` [PATCH 2/2] tzdata, matchbox-session, mini-x-session: replace RCONFLICTS with RCONFLICTS_ Martin Jansa
2012-06-18 12:42   ` Richard Purdie [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1340023339.8481.22.camel@ted \
    --to=richard.purdie@linuxfoundation.org \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox