diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-25 17:56:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-25 17:56:10 +0100 |
| commit | ba6115f56f066621a20fa545ddd67721afd35523 (patch) | |
| tree | 418b724d4f318d24dc8e5183e6b252922f85f149 /xorg-server/hw/xfree86/common/fourcc.h | |
| parent | eb71c0f23999d1cc156e1821d73634ec79621fc2 (diff) | |
| parent | e0927d908a12c9c140458c355b29b884a7705f2d (diff) | |
| download | vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.tar.gz vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.tar.bz2 vcxsrv-ba6115f56f066621a20fa545ddd67721afd35523.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitInput.c
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmsgwindow.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
Diffstat (limited to 'xorg-server/hw/xfree86/common/fourcc.h')
0 files changed, 0 insertions, 0 deletions