diff options
| author | marha <marha@users.sourceforge.net> | 2013-04-11 11:17:50 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-04-11 11:17:50 +0200 |
| commit | 527aeeb096cce731d40f1d9750503ff2b0c38d7c (patch) | |
| tree | bf355521a8b429f258ad269cd7d64758aeabf8f0 /libXpm/src/Image.c | |
| parent | d05e98bac92595d7e7367273c46d32c92d967ecb (diff) | |
| parent | 59038e048c4be1e69744b087ba31386e98141a8f (diff) | |
| download | vcxsrv-527aeeb096cce731d40f1d9750503ff2b0c38d7c.tar.gz vcxsrv-527aeeb096cce731d40f1d9750503ff2b0c38d7c.tar.bz2 vcxsrv-527aeeb096cce731d40f1d9750503ff2b0c38d7c.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libXau mesa xserver xkeyboard-config git update 8 Apr 2013
fontconfig mesa pixman xserver git update 25 Mar 2013
libX11 mesa git update 18 Mar 2013
fontconfig libX11 mesa pixman xserver xkeyboard-config git update 11 Mar 2013
fontconfig libfontenc mesa xserver git update 6 Mar 2013
Added xrdb app from git sources
Conflicts:
xorg-server/Xext/sync.c
Diffstat (limited to 'libXpm/src/Image.c')
0 files changed, 0 insertions, 0 deletions