summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-10-18 14:02:56 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-10-18 14:02:56 +0000
commit0ed630ee92d26828b61f1de72dc0b33d2a056123 (patch)
treecacd84f47a7bee88f7f16aaea38c170a72544e3c
parentace0f7c5b3ff46b93e13947f831a4c826651e070 (diff)
parenta433f3914ac13b11d980cbcf90e38e7a91ade1a7 (diff)
merge of '686e9c3c9548df9c0c138bec3dbfc29bd7d8c301'
and '9ad4a40895cac3d0144289560f4f5fc76596d11a'
-rw-r--r--conf/checksums.ini16
-rw-r--r--conf/distro/generic.conf2
2 files changed, 9 insertions, 9 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 63d24a7bc9..81b64d4668 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -399,8 +399,8 @@ md5=a556eef04aeb574ac8ab0dd8c868fcab
sha256=ceaa67f19a1c5462f5e739fcd3b53dd42b0173d9deee579c55e5088801559e43
[ftp://ftp.freebsd.org/pub/FreeBSD//ports/packages/archivers/rpm2cpio-1.2_2.tbz]
-md5=801fd27c30c2e68ab4f193f15f81abb3
-sha256=ecfcc4b5b6658f07eb01cee4d081e8a127b95c9b50a6dc94b622c09522545c53
+md5=d4950dc6918ca79a4abab306b6188512
+sha256=5ec970d34b4e22feea0333dae3b5f5ee0e38295d89e306b4929b910f4a2aae25
[ftp://ftp.freeciv.org/freeciv/stable/freeciv-1.14.1.tar.bz2]
md5=d328f65e7fca5252f27161f5f9e97a03
@@ -7023,8 +7023,8 @@ md5=79ea8c9cfa4025e93fb12d98befd37b6
sha256=9d5e27f290bbb954d512f37912d39a94ae03536a7ba3ef4dacec4df5f2476f47
[http://releases.0x539.de/obby/obby-0.4.1.tar.gz]
-md5=84c35d0cc6b603442e5ba0083fc1b8bb
-sha256=c297862f85270b388e3b5668ad897025fa46b91eac5bd2495efb131de572a9bc
+md5=b79146369fc76a61d6d4056a937c71c8
+sha256=b69a259795762881a5384072085bb501d77c6fb974e0b7a16ca573565ffe3629
[http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.10.tar.gz]
md5=c009b0c89e5cf91dba17261f4cccfc4c
@@ -7615,8 +7615,8 @@ md5=efa6dc867cec4b38febab2f0fe24a4d2
sha256=fed674a5ae64cb65328eecc752403e5e75e9ce486c19d86c5fa633afb23e0969
[http://subversion.tigris.org/downloads/subversion-1.3.1.tar.bz2]
-md5=cdb0c533b6983e8e1d447e277403e5bf
-sha256=efda6906a11a7fce514f400a5235b290efbe3458309bf8f547a2d49e10c56b1e
+md5=07b95963968ae345541ca99d0e7bf082
+sha256=4f10334d72266815ff427eb25e0e574efcc684dcf01e0229b7d02f63b068d39d
[http://subversion.tigris.org/downloads/subversion-1.4.0.tar.bz2]
md5=f0c5fef69fccfb12ef6c8598f484ed0e
@@ -8351,8 +8351,8 @@ md5=94d5223445deb1ed95973424d4958386
sha256=148bc83e4ab6e87a6f26b60efdffc1258752a42079783e6f2b080f287e8b15fc
[http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.2.tar.gz]
-md5=ab588f9ce651feddab6a8225c102d24c
-sha256=e5bce6201e04fda4badcfb265405133ecbc26d413f2f4e0efd3053ad2845c022
+md5=25585318503079a513af7064bb59c04d
+sha256=9e95499badd1b0da67b1422caa4198dbe61c961300b7001173eace18b8b2c38e
[http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.3.tar.gz]
md5=5c81a26b461b2abd4c02a918b8486539
diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf
index a9d667372f..7ab7818393 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/generic.conf
@@ -74,7 +74,7 @@ require conf/distro/include/sane-srcdates.inc
#
PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
PREFERRED_PROVIDER_tslib ?= "tslib"
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
#
# GPE