diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-05 10:19:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-05 10:19:03 +0200 |
| commit | 9441c8f47bb24faebc885bfc3c5e37f47a3ad984 (patch) | |
| tree | 276b55ded8f63c6bc5041785785ba927f168e077 /freetype/builds/toplevel.mk | |
| parent | c7b24c70d1e2d558d512665ffa5479e64b36692d (diff) | |
| parent | 6eaea4464631b5d8c1f44a46016163e351028afc (diff) | |
| download | vcxsrv-9441c8f47bb24faebc885bfc3c5e37f47a3ad984.tar.gz vcxsrv-9441c8f47bb24faebc885bfc3c5e37f47a3ad984.tar.bz2 vcxsrv-9441c8f47bb24faebc885bfc3c5e37f47a3ad984.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libXfont/configure.ac
libXfont/doc/fontlib.xml
libXfont/src/bitmap/bitscale.c
libXfont/src/fontfile/decompress.c
Diffstat (limited to 'freetype/builds/toplevel.mk')
| -rw-r--r-- | freetype/builds/toplevel.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/freetype/builds/toplevel.mk b/freetype/builds/toplevel.mk index d9fbee0b3..d552a4a17 100644 --- a/freetype/builds/toplevel.mk +++ b/freetype/builds/toplevel.mk @@ -199,7 +199,7 @@ dist: currdir=`pwd` ; \ for f in `find . -wholename '*/.git' -prune \ - -o -name .cvsignore \ + -o -name .gitignore \ -o -type d \ -o -print` ; do \ ln -s $$currdir/$$f tmp/$$f ; \ |