aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/kdrive/ephyr
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-12-081-0/+5
|\
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-081-0/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-251-1015/+1016
|\| | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c
| * mesa xserver pixman git update 25 nov 2011marha2011-11-251-1015/+1016
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-192-16/+27
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-192-16/+27
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-222-15/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c
| * libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011marha2011-09-222-15/+11
| |
* | Synchronised line endinge with release branchmarha2011-09-123-1828/+1828
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-101-1413/+1417
|\| | | | | | | | | Conflicts: mesalib/docs/GL3.txt
| * mesa xserver git update 10 aug 2011marha2011-08-101-1413/+1417
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-047-2013/+2014
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/docs/GL3.txt mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/SConscript xorg-server/Xext/xtest.c xorg-server/dix/getevents.c xorg-server/dix/window.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyr.h xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/src/kdrive.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/dri2/dri2.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/darwinXinput.c xorg-server/hw/xwin/InitInput.c xorg-server/include/input.h xorg-server/include/window.h xorg-server/mi/mipointer.c xorg-server/test/Makefile.am xorg-server/test/xi2/protocol-eventconvert.c
| * xserver mesa git update 4 July 2011marha2011-07-047-1975/+1976
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-061-0/+2
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/test/xi2/protocol-common.c xorg-server/xkb/xkbfmisc.c
| * mesa xserver xkb git update 6 Jun 2011marha2011-06-061-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-292-3/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH08.xml mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/queryobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_readpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mkfontscale/list.h pixman/pixman/Makefile.win32 xorg-server/dix/devices.c xorg-server/dix/events.c xorg-server/dix/inpututils.c xorg-server/fb/fbbltone.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xfree86/common/xf86Module.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xfree86/man/xorg.conf.man xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmouse.c xorg-server/include/input.h xorg-server/include/inputstr.h xorg-server/mi/mieq.c xorg-server/randr/rrscreen.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in
| * libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011marha2011-05-292-1157/+1183
| |
* | svn merge ^/branches/released .marha2011-01-193-20/+8
|\|
| * xserver pixman mesa git update 19 jan 2011marha2011-01-193-20/+8
| |
* | svn merge ^/branches/released .marha2010-12-081-1/+1
|\|
| * libXext xserver pixman git update 6-12-2010marha2010-12-061-1/+1
| |
* | svn merge ^/branches/released .marha2010-09-301-76/+59
|\|
| * xserver libX11 xkeyboard-config git update 30/9/2010marha2010-09-301-76/+59
| |
* | svn merge ^/branches/released .marha2010-07-071-7/+1
|\|
| * git update 7/7/2010marha2010-07-071-7/+1
| |
* | svn merge ^/branches/released .marha2010-07-012-6/+12
|\|
| * git update 1/7/2010marha2010-07-012-6/+12
| |
* | svn merge ^/branches/released .marha2010-06-161-62/+45
|\|
| * xserver and libxcb git update 11/6/2010marha2010-06-161-62/+45
| |
* | svn merge ^/branches/released .marha2010-06-142-21/+10
|\|
| * xserver git update 14/6/2010marha2010-06-142-21/+10
| |
* | svn merge ^/branches/released .marha2010-06-114-1521/+1521
|\|
| * xserver git update 11/6/2010marha2010-06-114-1483/+1483
| |
* | svn merge ^/branches/released .marha2010-05-272-631/+631
|\|
| * xserver git update 27/5/2010marha2010-05-272-631/+631
| |
| * xserver git update 15/5/2010marha2010-05-156-6140/+6139
| |
| * Removed files not in the git repositorymarha2010-04-285-959/+298
| |
| * Updated to following packages:marha2010-04-022-7/+9
| | | | | | | | | | pixman-0.18.0 xorg-server-1.8.0
| * Updated to xorg-server-1.7.99.902marha2010-03-221-0/+3
| |
* | svn merge -r588:HEAD ^/branches/released .marha2010-05-166-4971/+4970
| |
* | svn merge -r554:HEAD "^/branches/released" .marha2010-04-285-959/+298
| |
* | svn merge -r522:HEAD ^/branches/released .marha2010-04-022-7/+9
| |
* | svn merge -c505 ^/branches/released .marha2010-03-221-0/+3
| |
* | svn merge ^/branches/released .marha2010-02-151-0/+5
|\|
| * Git update 15/2/2010marha2010-02-151-0/+5
| |
* | svn merge ^/branches/releasedmarha2010-02-145-300/+8
|\|
| * Updated to xorg-server-1.7.99.901marha2010-02-145-300/+8
| |
* | svn merge ^/branches/releasedmarha2010-01-085-76/+87
|\|
| * Git update 8 jan 2010marha2010-01-085-76/+85
| |
* | svn merge ^/branches/releasedmarha2010-01-0510-252/+533
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 11:49:06 +0000