diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-04 09:55:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-04 09:55:03 +0200 |
| commit | 5e2417d0b8611db29de549832534a1de298c97df (patch) | |
| tree | 1b103a8b2114125ffa8d79827d931aba3744a0d2 /mesalib/Android.mk | |
| parent | fd2b28971a2afbf54b6cb641aa6a2d5e940a1450 (diff) | |
| parent | 150771e7aabf4c864b0b970c5b8d773634793abe (diff) | |
| download | vcxsrv-5e2417d0b8611db29de549832534a1de298c97df.tar.gz vcxsrv-5e2417d0b8611db29de549832534a1de298c97df.tar.bz2 vcxsrv-5e2417d0b8611db29de549832534a1de298c97df.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xwininfo fontconfig libX11 libXau libXdmcp libXext mesa libXinerama libxcb libxcb/xcb-proto libfontenc pixman xkbcomp mkfontscale xkeyboard-config git update 4 Jun 2013
dos2unix
Conflicts:
pixman/pixman/pixman-sse2.c
xorg-server/Xi/chgdctl.c
xorg-server/dix/dispatch.c
xorg-server/dix/events.c
xorg-server/dix/registry.c
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/windialogs.c
xorg-server/hw/xwin/winmultiwindowwindow.c
xorg-server/hw/xwin/winwindow.c
xorg-server/os/log.c
Diffstat (limited to 'mesalib/Android.mk')
0 files changed, 0 insertions, 0 deletions