From: Chris Larson <clarson@kergoth.com>
Date: Thu, 23 Sep 2004 16:48:28 +0000 (+0000)
Subject: Merge
X-Git-Tag: Release-2010-05/1~16932
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=383d6dfbf6844ec896b8da80af6070abf077601d;p=openembedded.git

Merge

2004/09/22 08:34:21+09:30 (none)!rwhitby
ignore:
  Removed the extraneous entries.

BKrev: 4152fe5ckHc_KeT30JwgLFvqP4RiCg
---

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 33685b89fc..92938cf1cd 100644
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -3,9 +3,3 @@ PENDING/*
 conf/local.conf
 conf/auto.conf
 tmp
-qtopia/qtopia_1_7_0.oe.~1~
-opie-opiealarm/.opie-opiealarm_cvs.oe.swp
-kdepimpi/libmicrokdelibs_cvs.oe
-meta/meta-opie-failed
-linux/nslu2-openslug-2.6.7/defconfig.orig
-linux/nslu2-linksys-2.4.22/nslu2/defconfig.safe