diff options
author | marha <marha@users.sourceforge.net> | 2012-10-01 12:04:07 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-01 12:04:07 +0200 |
commit | 7305d42f2ad0462ca3916a73df49cc6b70b41fe4 (patch) | |
tree | 4de7ec9601f83c61d84e9b8cda40ca0f5ca6bc91 /mesalib/Makefile.am | |
parent | c86fbbd2c3bb30e96a614456bbb7688e0387cf8c (diff) | |
parent | 7ed9dbafdbc724c1030404f29678559134de559b (diff) | |
download | vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.tar.gz vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.tar.bz2 vcxsrv-7305d42f2ad0462ca3916a73df49cc6b70b41fe4.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxcb mesa pixman xkeyboard-config git update 1 oct 2012
Conflicts:
libxcb/src/man/.gitignore
Diffstat (limited to 'mesalib/Makefile.am')
-rw-r--r-- | mesalib/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am index e411218eb..23355ff6b 100644 --- a/mesalib/Makefile.am +++ b/mesalib/Makefile.am @@ -21,6 +21,8 @@ SUBDIRS = src +ACLOCAL_AMFLAGS = -I m4 + doxygen: cd doxygen && $(MAKE) |