aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winclipboard/thread.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2014-10-121-1/+3
|\ | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/glsl_symbol_table.h mesalib/src/mesa/drivers/common/meta_blit.c xorg-server/dix/dispatch.c xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch_swap.c xorg-server/mi/miexpose.c
* | Some more synchronisation with released branchmarha2014-10-061-46/+11
| |
* | Resynchronised files with released versionmarha2014-10-031-0/+71
| |
* | Merge remote-tracking branch 'origin/released'marha2014-10-011-207/+189
|/ | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboard/internal.h xorg-server/hw/xwin/winclipboard/thread.c xorg-server/hw/xwin/winclipboard/wndproc.c xorg-server/hw/xwin/winclipboard/xevents.c xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winglobals.c
* libxtrans pixman fontconfig mesa xserver xkeyboard-config git update 1 Oct 2014marha2014-10-011-0/+498
plink 10277 xserver commit d3d845ca9e92f0a2ccde93f4242d7769cfe14164 xkeyboard-config commit 73aa90ce32967747c84a1b5fe32cee329bc3bbcf pixman commit f078727f392bc9f235df916e75634ed87177b9b4 libxtrans commit 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03 fontconfig commit 1082161ea303cf2bbc13b62a191662984131e820 mesa commit 4f7916ab4f8093fa33519dfa3d08e73b4d35ebe3