summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2004-09-16 21:03:27 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2004-09-16 21:03:27 +0000
commit549034381878f73b3c463fd1d044aee24ea391e8 (patch)
treeaf60e4f25d8ec0e7a6eb67e8eae3f7727ecbf251 /BitKeeper
parentec60fb50dbd054b49306851acc89d2423bf90346 (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into home.hrw.one.pl:/home/szczepan/zaurus/oe/packages 2004/09/16 23:03:15+02:00 hrw.one.pl!hrw powermanga: last attempt to get mixed CR/LF patch saved ok BKrev: 4149ff9f-XfU9eplfEI1XNH2NSGSmw
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/ignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index c0d79b827b..9ea0d96409 100644
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -5,3 +5,5 @@ 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