diff options
author | Daniel Willmann <daniel@totalueberwachung.de> | 2007-07-31 11:19:12 +0000 |
---|---|---|
committer | Daniel Willmann <daniel@totalueberwachung.de> | 2007-07-31 11:19:12 +0000 |
commit | f0db4f4a1cae982fda3d2c4c26c34671b1aeee5c (patch) | |
tree | 886ff72572753c7621fa8de7374adca3766620fe /packages | |
parent | 3226024921a95fd571dbccdf7752266c20690c1f (diff) | |
parent | 3f771b5c3791590f2cde82c732c4065e96a23c28 (diff) |
merge of '3f578fcf74e37d012b104754e3387f72f82fa832'
and 'aa90cc7b5525f5dcbe8d32593886404ea450d216'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 2 | ||||
-rwxr-xr-x | packages/openmoko2/openmoko-session2/etc/matchbox/session | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 96c027f3db..9c87a2e318 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "x11" RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" RCONFLICTS = "openmoko-session" -PR = "r21" +PR = "r22" SRC_URI = "file://etc" S = ${WORKDIR} diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index de0db79475..6c8c62dca5 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -2,8 +2,8 @@ SHOWCURSOR="no" -openmoko-today2 & -openmoko-dialer2 & +openmoko-today & +openmoko-dialer & matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & |