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

1 files changed, 1 insertions, 1 deletions

diff --git a/opie-launcher-settings/opie-launcher-settings_cvs.oe b/opie-launcher-settings/opie-launcher-settings_cvs.oe
index f7deca03bc..825a210994 100644
--- a/opie-launcher-settings/opie-launcher-settings_cvs.oe
+++ b/opie-launcher-settings/opie-launcher-settings_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "libqtaux2"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 APPNAME = "launchersettings"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/settings/launcher \