diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-01 23:12:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-01 23:12:13 +0200 |
| commit | 88236adfe3eb41b8368b4c9ecf3e09a7199dc474 (patch) | |
| tree | 6acb3f7ad3c60c4605551245df9c321b5fb22c3b /xorg-server/makefile | |
| parent | e4086b3defb6186a2fb8a5845968c97e613fb493 (diff) | |
| parent | 30eb28e89e513ba7c04e8424be0cba326a01882b (diff) | |
| download | vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.tar.gz vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.tar.bz2 vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.zip | |
Merge remote-tracking branch 'origin/released'
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
Diffstat (limited to 'xorg-server/makefile')
| -rw-r--r-- | xorg-server/makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-server/makefile b/xorg-server/makefile index 2e441e4a5..789b73114 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -12,6 +12,7 @@ INCLUDELIBFILES = \ glx\$(OBJDIR)\libglx.lib \ hw\xwin\$(OBJDIR)\libXWin.lib \ hw\xwin\glx\$(OBJDIR)\libwinglx.lib \ + hw\xwin\winclipboard\$(OBJDIR)\libXWinclipboard.lib \ mi\$(OBJDIR)\libmi.lib \ miext\damage\$(OBJDIR)\libdamage.lib \ miext\shadow\$(OBJDIR)\libshadow.lib \ |