Merge remote-tracking branch 'origin/released'

Conflicts:
	X11/Xfuncproto.h.in
	X11/configure.ac
	X11/keysymdef.h
	freetype/include/freetype/internal/pcftypes.h
	freetype/src/cache/ftcbasic.c
	freetype/src/cache/ftccmap.c
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/link_functions.cpp
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/program/prog_optimize.c
	mesalib/src/mesa/state_tracker/st_program.c
	pthreads/Makefile

1 files changed, 5 insertions, 5 deletions

diff --git a/packages.txt b/packages.txt
index d9b9cb17c..72b25812e 100644
--- a/packages.txt
+++ b/packages.txt
@@ -44,9 +44,9 @@ font-winitzki-cyrillic-1.0.3
 font-xfree86-type1-1.0.4

 fontconfig git version

 fontsproto-2.1.1

-freetype-2.4.4

+freetype-2.4.5

 glproto git version

-inputproto-2.0.1

+inputproto-2.0.2

 kbproto-1.0.5

 libX11 git version

 libXau git version

@@ -67,11 +67,11 @@ mesa git version
 mkfontscale git version

 openssl-1.0.0d

 pixman git version

-pthreads-w32-2-8-0-release

+pthreads-w32 cvs version

 randrproto git version

 recordproto-1.14.1

 renderproto-0.11.1

-resourceproto-1.1.1

+resourceproto-1.2.0

 scrnsaverproto-1.2.1

 terminus-font-4.30

 ttf-bitstream-vera-1.10

@@ -85,7 +85,7 @@ xextproto git version
 xineramaproto-1.2.1

 xkbcomp git version

 xkeyboard-config git version

-xproto-7.0.21

+xproto-7.0.22

 xserver git version

 xtrans git version

 xwininfo git version