diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-12 11:22:24 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-12 11:22:24 +0100 |
| commit | f1b679a372274041aa3e7a02f979390b17eb1ab5 (patch) | |
| tree | f5bad38b25c1e5bf69cb06b4236cccb4310f769f /pixman | |
| parent | 3ef320ddf5d23b4e69cc7d44a17f902e245f6426 (diff) | |
| parent | b73c544c61712f7bd57f3c9a0f6046481f58038b (diff) | |
| download | vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.gz vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.bz2 vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman mesa fontconfig git update 12 nov 2013
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/configure.ac | 4 | ||||
| -rw-r--r-- | pixman/demos/Makefile.am | 4 | ||||
| -rw-r--r-- | pixman/test/thread-test.c | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index 5e512be8e..5910fbb4b 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -53,8 +53,8 @@ AC_PREREQ([2.57]) # m4_define([pixman_major], 0) -m4_define([pixman_minor], 31) -m4_define([pixman_micro], 3) +m4_define([pixman_minor], 33) +m4_define([pixman_micro], 1) m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro]) diff --git a/pixman/demos/Makefile.am b/pixman/demos/Makefile.am index 9be9ab670..e04743d7f 100644 --- a/pixman/demos/Makefile.am +++ b/pixman/demos/Makefile.am @@ -1,3 +1,5 @@ +EXTRA_DIST = parrot.c parrot.jpg scale.ui + if HAVE_GTK AM_CFLAGS = $(OPENMP_CFLAGS) @@ -28,8 +30,6 @@ DEMOS = \ srgb-test \ scale -EXTRA_DIST = parrot.c parrot.jpg scale.ui - gradient_test_SOURCES = gradient-test.c $(GTK_UTILS) alpha_test_SOURCES = alpha-test.c $(GTK_UTILS) composite_test_SOURCES = composite-test.c $(GTK_UTILS) diff --git a/pixman/test/thread-test.c b/pixman/test/thread-test.c index fa2193302..0b07b269d 100644 --- a/pixman/test/thread-test.c +++ b/pixman/test/thread-test.c @@ -1,4 +1,4 @@ -#include <config.h> +#include "utils.h" #ifndef HAVE_PTHREADS @@ -12,7 +12,6 @@ int main () #include <stdlib.h> #include <pthread.h> -#include "utils.h" typedef struct { |