From badb3eafc9060609d6a484f1cc2e19925b5825c4 Mon Sep 17 00:00:00 2001 From: Holger Freyther <zecke@selfish.org> Date: Sat, 13 Nov 2004 20:11:32 +0000 Subject: Merge the conflict 2004/11/13 21:06:11+01:00 handhelds.org!zecke Opie 1.1.7: Remove CVSDATE and PR from the package files 2004/11/13 20:52:18+01:00 handhelds.org!zecke Update packaging of 1.1.7 to match the 'cvs' version of the Opie versions 2004/11/13 20:36:08+01:00 handhelds.org!zecke Upgrade all Opie 1.1.6 files to Opie 1.1.7 in preparation of the next OpenZaurus/Familiar release. Remove all occurrences of Opie1.1.6 in the files BKrev: 41966a744AeMTtlPuskXFPg512ykqQ --- opie-dvorak/opie-dvorak_1.1.6.oe | 0 opie-dvorak/opie-dvorak_1.1.7.oe | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 opie-dvorak/opie-dvorak_1.1.6.oe create mode 100644 opie-dvorak/opie-dvorak_1.1.7.oe (limited to 'opie-dvorak') diff --git a/opie-dvorak/opie-dvorak_1.1.6.oe b/opie-dvorak/opie-dvorak_1.1.6.oe deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/opie-dvorak/opie-dvorak_1.1.7.oe b/opie-dvorak/opie-dvorak_1.1.7.oe new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3