summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorDavid-John Willis <John.Willis@Distant-earth.com>2010-01-03 21:57:27 +0000
committerKoen Kooi <koen@openembedded.org>2010-02-18 13:41:16 +0100
commit27ae9191f50d54132dfff568d1ae9ddea87df957 (patch)
treea0d4e5498d1c383b20279de7417649b765652216 /conf
parenta5cc33f7ae7416cd20772740a2deac1985d791ef (diff)
xfce4-power-manager: Remove broken xfce4-power-manager_4.6.1.bb and add latest 0.8.4.2 to xfce-extras.
* xfce4-power-manager_4.6.1.bb was a dummy package that never worked (a left over from my Xfce 4.6.1 work). 0.8.4.2 is the correct version to use with Xfce 4.6.* >.
Diffstat (limited to 'conf')
-rw-r--r--conf/checksums.ini8
1 files changed, 8 insertions, 0 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 72b015b5c9..98dc0a5f5b 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -30830,7 +30830,15 @@ sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
md5=88352816c84cbea57121b0c478976976
sha256=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
+<<<<<<< HEAD:conf/checksums.ini
[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-session-4.4.2.tar.bz2]
+=======
+[http://archive.xfce.org/src/apps/xfce4-power-manager/0.8/xfce4-power-manager-0.8.4.2.tar.bz2]
+md5=3131257750766838a64a9bb7f74eb2a1
+sha256=16cc04bf613ecfbc9ea43514ccb5f7d7923b7fc4ebf8117c0ce32fa1422334e1
+
+[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2]
+>>>>>>> xfce4-power-manager: Remove broken xfce4-power-manager_4.6.1.bb and add latest 0.8.4.2 to xfce-extras.:conf/checksums.ini
md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7
sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6