diff options
| author | marha <marha@users.sourceforge.net> | 2015-03-05 23:40:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-03-05 23:42:09 +0100 |
| commit | c646056120fe14e4c4ccf81bac5d78d61225a8e8 (patch) | |
| tree | ba0af42750f0ab6dc4724342a7063835636222b5 /fontconfig/src/makefile | |
| parent | 87e58a93f7248171e736656080069cb65ff56aae (diff) | |
| parent | 8574eba804031f6b19713f0b02952280730bf62e (diff) | |
| download | vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.gz vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.tar.bz2 vcxsrv-c646056120fe14e4c4ccf81bac5d78d61225a8e8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/queryobj.c
Diffstat (limited to 'fontconfig/src/makefile')
| -rwxr-xr-x | fontconfig/src/makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fontconfig/src/makefile b/fontconfig/src/makefile index 49f0fddef..0a42b7cd4 100755 --- a/fontconfig/src/makefile +++ b/fontconfig/src/makefile @@ -13,6 +13,7 @@ $(OBJDIR)\fcobjshash.h: $(OBJDIR)\fcobjshash.gperf load_makefile NORELDBG=1 ..\fc-case\makefile load_makefile NORELDBG=1 ..\fc-glyphname\makefile load_makefile NORELDBG=1 ..\fc-lang\makefile +load_makefile NORELDBG=1 ..\fc-blanks\makefile CSRCS = \ fcatomic.c \ |