From 0426c6b79f5dadd9b37770d2f1ff331a8c3fe30d Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Sun, 19 Sep 2004 14:19:34 +0000
Subject: Merge Opie-Console_CVS Conflict

2004/09/19 16:15:58+02:00 handhelds.org!zecke
Bump the Version number of the Opie CVS Packages to 1.1.6-cvs-${CVSDATE}

2004/09/19 01:46:25+02:00 handhelds.org!zecke
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported

2004/09/19 01:45:58+02:00 handhelds.org!zecke
Beagle Kernel work:
Fix APM handling
Include more modules, for example mtdchar so that one can erase the partition if needed
Change the BootLogo to another bootscreen

2004/09/18 13:24:59+02:00 handhelds.org!zecke
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported

2004/09/17 02:52:19+02:00 handhelds.org!zecke
Beagle updates and implementations
-Make tslib work with the beagle touchscreen interface
-Qt/E map the lightning to Key 91, allow keyboard repeating
-Provide default modules and modules.conf for modules-colleteral
-Do not use Intel Assabat as machine name for beagle
-Fix dependencies by fixing spelling

BKrev: 414d9576pvCHcHdDvMCQrAF7FbMcLg
---
 opie-dvorak/opie-dvorak_cvs.oe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'opie-dvorak')

diff --git a/opie-dvorak/opie-dvorak_cvs.oe b/opie-dvorak/opie-dvorak_cvs.oe
index b33c21dc3b..ef54a1b183 100644
--- a/opie-dvorak/opie-dvorak_cvs.oe
+++ b/opie-dvorak/opie-dvorak_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-pickboard"
 RDEPENDS = "opie-pickboard"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 PR = "r1"
 APPNAME = "qdvorak"
 
-- 
cgit v1.2.3