pixman: Branch 'master'

[Julien Cristau]

 pixman/Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2976e690410d10b916014effe5d1842d0c8a7908
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun Apr 6 17:12:12 2008 +0200

    Revert "pixman-version.h is generated, don't distribute it"
    
    This reverts commit 4fd8910ea499eb484e29c44dbee7dbc029656e9c.

diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 2d84ec4..190df4c 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -24,8 +24,7 @@ libpixman_1_la_SOURCES =		\
 	pixman-timer.c
 
 libpixmanincludedir = $(includedir)/pixman-1/
-libpixmaninclude_HEADERS = pixman.h
-nodist_libpixmaninclude_HEADERS = pixman-version.h
+libpixmaninclude_HEADERS = pixman.h pixman-version.h
 noinst_LTLIBRARIES = 
 
 EXTRA_DIST = Makefile.win32