summaryrefslogtreecommitdiff
path: root/opie-suspendapplet
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2004-11-13 20:11:32 +0000
committerHolger Freyther <zecke@selfish.org>2004-11-13 20:11:32 +0000
commitbadb3eafc9060609d6a484f1cc2e19925b5825c4 (patch)
tree24d23afd39a315ba7a5d0dae36d5d1c8d2579aaa /opie-suspendapplet
parent3d5519e88c30876da6f211f62e226e23a98d3215 (diff)
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
Diffstat (limited to 'opie-suspendapplet')
-rw-r--r--opie-suspendapplet/opie-suspendapplet_1.1.7.oe (renamed from opie-suspendapplet/opie-suspendapplet_1.1.6.oe)0
1 files changed, 0 insertions, 0 deletions
diff --git a/opie-suspendapplet/opie-suspendapplet_1.1.6.oe b/opie-suspendapplet/opie-suspendapplet_1.1.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/opie-suspendapplet/opie-suspendapplet_1.1.6.oe
+++ b/opie-suspendapplet/opie-suspendapplet_1.1.7.oe