aboutsummaryrefslogtreecommitdiff
path: root/releasenotes
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-21 14:43:05 +0200
committermarha <marha@users.sourceforge.net>2011-06-21 14:43:05 +0200
commit6bf5e6441da930ba3c1541f4e5e61ef7e6866b35 (patch)
tree0cac64c1f2404632d76fb87895d60eff1cd53651 /releasenotes
parent2fcbb7316a41857c67cd6bd1667853a2ff6b2fb9 (diff)
parent8a49ff701cfa50f9dcb237051e2ba7ac0302a515 (diff)
downloadvcxsrv-6bf5e6441da930ba3c1541f4e5e61ef7e6866b35.tar.gz
vcxsrv-6bf5e6441da930ba3c1541f4e5e61ef7e6866b35.tar.bz2
vcxsrv-6bf5e6441da930ba3c1541f4e5e61ef7e6866b35.zip
Merge remote-tracking branch 'origin/released'
Conflicts: fontconfig/doc/fcformat.fncs fontconfig/fc-cat/fc-cat.c fontconfig/fc-list/fc-list.c fontconfig/fc-match/fc-match.c fontconfig/src/fcdir.c fontconfig/src/fcformat.c fontconfig/src/fcname.c mesalib/src/glsl/linker.cpp mesalib/src/mesa/state_tracker/st_format.c
Diffstat (limited to 'releasenotes')
0 files changed, 0 insertions, 0 deletions