aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkb/makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-12-221-0/+0
| | | | | | | | | | | | | | | | | | | | | | | * origin/released: libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver pixman xkeyboard-config git update 22 Dec 2013 Conflicts: mesalib/include/GL/glext.h mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/swrast/swrast.c xorg-server/damageext/damageext.c xorg-server/dix/dispatch.c xorg-server/glx/glxdriswrast.c xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch_swap.c xorg-server/glx/indirect_program.c xorg-server/glx/render2.c xorg-server/glx/render2swap.c xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/glthunk.c xorg-server/hw/xwin/glx/indirect.c xorg-server/include/os.h xorg-server/present/present_request.c
* Solved compile problems due to latest mergemarha2012-11-201-2/+1
|
* svn merge -r539:HEAD "^/branches/released" .marha2010-04-191-3/+1
|
* svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .marha2009-09-091-2/+0
|
* vcxsrv compiles now. Still run-time errors.marha2009-07-271-1/+0
|
* Changes for VC compilationmarha2009-07-121-0/+47