From b2d92b9af5473339edb902f7fea7dcad09ef57af Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Fri, 7 Jan 2005 12:40:11 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/07 13:22:43+01:00 local!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into marcinj.local:/home/hrw/zaurus/bb/openembedded 2005/01/07 13:20:27+01:00 mn-solutions.de!schurig Merge http://oe-devel@openembedded.bkbits.net/openembedded into mnz66.mn-solutions.de:/usr/src/oe/p 2005/01/07 13:20:08+01:00 mn-solutions.de!schurig some ipk splits 2005/01/07 13:17:51+01:00 local!hrw opie-qasteroids: packaged all gfx 2005/01/07 12:47:16+01:00 (none)!br1 Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into null.(none):/data/mtx/closed/build/unstable/openembedded 2005/01/07 12:46:53+01:00 (none)!br1 pmacct: added init script and default config 2005/01/07 12:40:36+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/07 12:40:28+01:00 uni-frankfurt.de!mickeyl add hydra 4.5 network scanner 2005/01/07 11:39:53+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/07 11:39:39+00:00 nexus.co.uk!pb add missing ')' to keymap.sh in gpe-session-scripts patch from Hermann Lacheiner 2005/01/07 12:38:18+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/07 00:54:15+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into merlin.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/01/06 20:33:27+01:00 uni-frankfurt.de!mickeyl more work on qte-4 BKrev: 41de832bRxXKI3wOya_X0XTAXkDJHA --- packages/gpe-session-scripts/files/keymap.sh | 2 +- packages/gpe-session-scripts/gpe-session-scripts_0.62.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/gpe-session-scripts') diff --git a/packages/gpe-session-scripts/files/keymap.sh b/packages/gpe-session-scripts/files/keymap.sh index 3f2910b439..a34e91ffb1 100644 --- a/packages/gpe-session-scripts/files/keymap.sh +++ b/packages/gpe-session-scripts/files/keymap.sh @@ -6,7 +6,7 @@ case $MACHINE in "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") xmodmap - < /etc/X11/shepherd.xmodmap ;; - "Sharp-Collie" + "Sharp-Collie") xmodmap - < /etc/X11/collie.xmodmap ;; "Simpad") diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb index 22b5f7fe20..dc758aee11 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r7" +PR = "r8" inherit gpe -- cgit v1.2.3