From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 3 Feb 2005 11:13:41 +0000 (+0000)
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
X-Git-Tag: Release-2010-05/1~15178
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a20e82f03e1fef9623ea838ef41f7ff19b8894f3;p=openembedded.git

Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into marcinj.local:/home/hrw/zaurus/bb/openembedded

2005/02/03 12:13:14+01:00 local!hrw
renamed IRK packages to allow both to get into feed
set conflicts/replaces to get only one installed at time

BKrev: 42020765cE4wQU3kGtpeodtL3ySPvQ
---

diff --git a/packages/irk/irk_0.11-belkin.bb b/packages/irk/irk-belkin_0.11.bb
similarity index 100%
rename from packages/irk/irk_0.11-belkin.bb
rename to packages/irk/irk-belkin_0.11.bb
diff --git a/packages/irk/irk_0.11-targus.bb b/packages/irk/irk_0.11.bb
similarity index 100%
rename from packages/irk/irk_0.11-targus.bb
rename to packages/irk/irk_0.11.bb