aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-05 10:19:03 +0200
committermarha <marha@users.sourceforge.net>2011-09-05 10:19:03 +0200
commit9441c8f47bb24faebc885bfc3c5e37f47a3ad984 (patch)
tree276b55ded8f63c6bc5041785785ba927f168e077 /apps
parentc7b24c70d1e2d558d512665ffa5479e64b36692d (diff)
parent6eaea4464631b5d8c1f44a46016163e351028afc (diff)
downloadvcxsrv-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 'apps')
0 files changed, 0 insertions, 0 deletions