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/win32/visualc/freetype.vcproj | |
| 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/win32/visualc/freetype.vcproj')
| -rw-r--r-- | freetype/builds/win32/visualc/freetype.vcproj | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/freetype/builds/win32/visualc/freetype.vcproj b/freetype/builds/win32/visualc/freetype.vcproj index eb585dd11..8c54ba4bf 100644 --- a/freetype/builds/win32/visualc/freetype.vcproj +++ b/freetype/builds/win32/visualc/freetype.vcproj @@ -70,7 +70,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype245.lib"
+ OutputFile="..\..\..\objs\freetype246.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -145,7 +145,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype245MT.lib"
+ OutputFile="..\..\..\objs\freetype246MT.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -220,7 +220,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype245ST.lib"
+ OutputFile="..\..\..\objs\freetype246ST.lib"
/>
<Tool
Name="VCALinkTool"
@@ -292,7 +292,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype245_D.lib"
+ OutputFile="..\..\..\objs\freetype246_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -365,7 +365,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype245ST_D.lib"
+ OutputFile="..\..\..\objs\freetype246ST_D.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -439,7 +439,7 @@ />
<Tool
Name="VCLibrarianTool"
- OutputFile="..\..\..\objs\freetype245MT_D.lib"
+ OutputFile="..\..\..\objs\freetype246MT_D.lib"
SuppressStartupBanner="true"
/>
<Tool
|