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/links/links-x11_2.0+2.1pre30.bb | |
| 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/links/links-x11_2.0+2.1pre30.bb')
| -rw-r--r-- | recipes/links/links-x11_2.0+2.1pre30.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/links/links-x11_2.0+2.1pre30.bb b/recipes/links/links-x11_2.0+2.1pre30.bb index 02eae7729d..d83b10103e 100644 --- a/recipes/links/links-x11_2.0+2.1pre30.bb +++ b/recipes/links/links-x11_2.0+2.1pre30.bb @@ -1,8 +1,8 @@ require links.inc DEPENDS += "virtual/libx11" -RCONFLICTS = "links" -PR = "r1" +RCONFLICTS_${PN} = "links" +PR = "r2" SRC_URI += " file://links2.desktop \ http://www.xora.org.uk/oe/links2.png;name=icon" |