diff options
author | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
commit | 0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (patch) | |
tree | 8239768e506a03837019c4f02c8ab949c04a0818 /freetype/freetype.vcxproj.filters | |
parent | 7dbaa1cffdf176f803f2c7069fb6810e16a86f72 (diff) | |
parent | a473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (diff) | |
download | vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.gz vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.bz2 vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013
Conflicts:
libXinerama/src/Xinerama.c
Diffstat (limited to 'freetype/freetype.vcxproj.filters')
-rw-r--r-- | freetype/freetype.vcxproj.filters | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/freetype/freetype.vcxproj.filters b/freetype/freetype.vcxproj.filters index ee6cca4d5..a640676fa 100644 --- a/freetype/freetype.vcxproj.filters +++ b/freetype/freetype.vcxproj.filters @@ -197,6 +197,9 @@ <ClCompile Include="src\base\ftbitmap.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\pcf\pcfutil.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\freetype\freetype.h">
|