diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-12 13:55:55 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-12 13:56:28 +0100 |
| commit | 0e01270aeda311bf52c046f6a68e8b3e1fa86cb8 (patch) | |
| tree | eee062f34219e5c5d3f3e61caa5d3c39a5185794 /xorg-server/xkb/XKBGAlloc.c | |
| parent | 3893ee9f6b12465239b63d08763bd9ba0bd329e5 (diff) | |
| parent | 4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (diff) | |
| download | vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.gz vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.tar.bz2 vcxsrv-0e01270aeda311bf52c046f6a68e8b3e1fa86cb8.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Updated zlib to 1.2.8
Conflicts:
zlib/win32/zlib.def
Diffstat (limited to 'xorg-server/xkb/XKBGAlloc.c')
0 files changed, 0 insertions, 0 deletions