From 0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 2 Apr 2010 13:46:21 +0000
Subject: svn merge -r522:HEAD ^/branches/released .

---
 packages.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages.txt')

diff --git a/packages.txt b/packages.txt
index ba80575e8..beb4e4cc7 100644
--- a/packages.txt
+++ b/packages.txt
@@ -63,7 +63,7 @@ libXt-1.0.8
 mesa-7.7
 mkfontscale-1.0.7
 openssl-1.0.0
-pixman-0.17.12
+pixman-0.18.0
 pthreads-w32-2-8-0-release
 randrproto-1.3.1
 recordproto-1.14
@@ -80,7 +80,7 @@ xextproto-7.1.1
 xineramaproto-1.2
 xkbcomp-1.1.1
 xkeyboard-config-1.8
-xorg-server-1.7.99.902
+xorg-server-1.8.0
 xproto-7.0.16
 xtrans-1.2.5
 xwininfo-1.0.5
-- 
cgit v1.2.3