aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-0312-446/+498
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/configs/linux-dri mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/drivers/dri/Makefile.template mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/dix/window.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwin.h xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xquartz/pbproxy/app-main.m xorg-server/hw/xquartz/pbproxy/pbproxy.h xorg-server/hw/xquartz/pbproxy/x-selection.m xorg-server/hw/xquartz/xpr/xpr.h xorg-server/hw/xquartz/xpr/xprEvent.c xorg-server/hw/xquartz/xpr/xprScreen.c xorg-server/include/privates.h xorg-server/include/protocol-versions.h xorg-server/test/Makefile.am xorg-server/xfixes/cursor.c xorg-server/xfixes/xfixes.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/de xorg-server/xkeyboard-config/symbols/lk xorg-server/xkeyboard-config/symbols/ru
| * xserver xkeyboard-config mesa git update 3 Jun 2011marha2011-06-0312-446/+498
| |
* | Solved merge problemmarha2011-05-301-5/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-2910-1220/+1303
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2910-2378/+2456
| |
* | Solved possible crash because windows window disappears in the middle of a ↵1.10.1.1marha2011-05-241-0/+5
| | | | | | | | function call
* | Format of dispatch.h has been changedmarha2011-05-241-1/+1
| |
* | Bumped version to 1.10.1.1marha2011-05-241-1/+1
| |
* | merge ^/branches/released .marha2011-05-241-1/+1
|\|
| * xserver mesa git update 24 May 2011marha2011-05-241-1/+1
| |
* | merge ^/branches/released .marha2011-05-2313-559/+603
|\|
| * xserver git update 23 May 2011marha2011-05-2313-142/+186
| |
* | svn merge ^/branches/released .marha2011-05-221-556/+554
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-221-556/+554
| | | | | | | | May 2011
* | merge ^/branches/released .marha2011-05-1642-11717/+12387
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-1642-12604/+13274
| |
* | Bumped version to 1.10.11.10.1marha2011-05-051-1/+1
|\| | | | | | | | | | | Added release note svn merge ^/branches/released .
* | Solved crash because of pointer usages after the memory has been freed.marha2011-05-051-4/+19
| |
* | svn merge ^/branches/released .marha2011-04-304-262/+242
|\|
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-304-290/+270
| |
* | svn merge ^/branches/released .marha2011-04-291-12/+6
|\|
| * xserver mesa git update 28 Apr 2011marha2011-04-291-12/+6
| |
* | svn merge ^/branches/released .marha2011-04-2853-11444/+11279
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-2855-15191/+15065
| |
* | svn merge ^/branches/released .marha2011-04-2714-1532/+1601
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-2714-3398/+3467
| |
* | svn merge ^/branches/released .marha2011-04-151-9/+13
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-151-9/+13
| |
* | svn merge ^/branches/released .marha2011-04-142-21/+20
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-142-2203/+2202
| |
* | svn merge ^/branches/released .marha2011-04-061-1/+1
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-1/+1
| |
* | Solved crash due to null pointer accessmarha2011-04-051-0/+7
| |
* | svn merge ^/branches/released .marha2011-04-055-12/+40
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-055-3988/+4016
| |
* | svn merge ^/branches/released .marha2011-03-305-363/+323
|\|
| * xserver mesa git update 30 Mar 2011marha2011-03-305-2175/+2135
| |
* | 10.0.0.1marha2011-03-291-1/+1
| |
* | svn merge ^/branches/released .marha2011-03-2815-711/+291
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-2814-10229/+9811
| |
* | svn merge ^/branches/released .marha2011-03-243-1843/+1844
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011marha2011-03-243-610/+611
| |
* | svn merge ^/branches/released .marha2011-03-209-18/+21
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-209-4224/+4227
| |
* | Solved possible crash due to NULL pointer accessmarha2011-03-181-1/+4
| |
* | svn merge ^/branches/released .marha2011-03-171-2478/+2485
|\|
| * xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-171-3/+10
| |
* | Delay calling winInitializeModeKeyStates until the keyboard device has been ↵marha2011-03-161-2/+2
| | | | | | | | started
* | svn merge ^/branches/released .marha2011-03-1516-2429/+2310
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-1515-6343/+6224
| |