aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2014-10-011-6/+3
| | | | | | | | | | | | | 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
* Merge remote-tracking branch 'origin/released'marha2013-09-101-1/+1
| | | | | | | | | | | | * origin/released: fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013 Conflicts: mesalib/src/glsl/.gitignore xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winsetsp.c
* Merge remote-tracking branch 'origin/released'marha2013-07-251-0/+1
| | | | | | | | | | | | | | | | | | * origin/released: xserver mesa git update 25 Jul 2013 Conflicts: xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmultiwindowclass.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwindowswm.c xorg-server/hw/xwin/winwndproc.c
* Merge remote-tracking branch 'origin/released'marha2012-11-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig xserver mesa git update 29 nov 2012 Conflicts: xorg-server/dix/dispatch.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwindow.h xorg-server/os/osinit.c xorg-server/os/utils.c
* Merge remote-tracking branch 'origin/released'marha2012-10-301-1/+0
| | | | | | | | | | | | | | | | | * origin/released: fontconfig xserver mesa git update 30 oct 2012 Conflicts: xorg-server/dix/grabs.c xorg-server/hw/xwin/winclipboard.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winmsg.h xorg-server/hw/xwin/winprefslex.l xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winregistry.c
* Merge remote-tracking branch 'origin/released'marha2012-07-181-1/+0
| | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore xorg-server/Xext/panoramiX.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwndproc.c
* Merge remote-tracking branch 'origin/released'marha2011-07-141-1/+1
| | | | | | | | | | | Conflicts: mesalib/src/mesa/state_tracker/st_context.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.c xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/man/XWin.man xorg-server/hw/xwin/winmultiwindowwindow.c
* Removed dependency on itselfmarha2011-03-071-1/+1
|
* Use flex and bison from tools/mhmakemarha2011-03-071-12/+2
|
* Solved possible parallel build problemmarha2011-02-211-0/+2
|
* Added host selection menu in case -broadcast was specifiedmarha2011-02-011-1/+2
|
* Enabled ROOTLESS option in dix (currenlty not really used)marha2011-01-281-47/+98
|
* svn merge ^/branches/released .marha2011-01-211-2/+3
|
* Solved wrong dependency in xorg-server/hw/xwin/makefilemarha2010-10-291-1/+1
|
* Avoid needless rebuild when switching between debug and release buildmarha2010-08-061-3/+5
|
* Removed NATIVEGDI compilation (is currenlty crashing)marha2010-02-151-15/+19
|
* Native glx is compiling and running now (although no acceleration is ↵marha2009-11-201-0/+1
| | | | happening... to be investigated further)
* Use flex and bison to generate winprefslex.c winprefsyacc.c and winprefsyacc.hmarha2009-11-161-0/+5
|
* Syncronised makefile and makefile.am a little bit more.marha2009-10-081-23/+23
|
* X server is running again (at least via xdmcp)marha2009-07-281-1/+8
|
* vcxsrv compiles now. Still run-time errors.marha2009-07-271-1/+0
|
* Changes for VC compilationmarha2009-07-121-0/+101
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 01:18:08 +0000