aboutsummaryrefslogtreecommitdiff
path: root/freetype
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-06-08 15:07:46 +0200
committermarha <marha@users.sourceforge.net>2014-06-08 15:07:46 +0200
commitb5a2c971202ff19079cb5a98253d8760ae124d15 (patch)
tree451469af3bf1c7d9ce0236ba546867bbf6a2fb3a /freetype
parent71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec (diff)
parentd435b20322433b335a4fc5693cce0399a3f27b2d (diff)
downloadvcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.tar.gz
vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.tar.bz2
vcxsrv-b5a2c971202ff19079cb5a98253d8760ae124d15.zip
Merge remote-tracking branch 'origin/released'
Conflicts: X11/Xwindows.h
Diffstat (limited to 'freetype')
0 files changed, 0 insertions, 0 deletions