aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-07-11126-27695/+3208
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/shm.c xorg-server/Xext/sync.c xorg-server/Xext/xf86bigfont.c xorg-server/Xi/opendev.c xorg-server/dix/dispatch.c xorg-server/include/globals.h xorg-server/mi/miinitext.c
| * fontconfig mesa xserver git update 10 Jul 2012marha2012-07-10126-27695/+3208
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0923-69/+1036
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h
| * fontconfig libX11 mesa pixman xserver git update 9 Jul 2012marha2012-07-0923-69/+1036
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0614-133/+60
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/privates.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/src/kinput.c
| * randrproto fontconfig mesa xserver git update 6 Jul 2012marha2012-07-0614-133/+60
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0411-24/+27
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-0411-24/+27
| |
* | Synchronised filemarha2012-06-291-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-294-61/+43
|\| | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/indirect.c
| * xkeyboard-config xserver pixman mesa git update 29 Jun 2012marha2012-06-294-45/+45
| |
* | Synchronised filesmarha2012-06-284-20/+44
| |
* | libX11 is now compiled as dllmarha2012-06-261-11/+3
| |
* | zlib is now compiled as a dllmarha2012-06-251-0/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2215-30/+0
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-2215-30/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-214-15/+40
|\|
| * mesa pixman xkeyboard-config xserver git update 21 Jun 2012marha2012-06-214-15/+40
| |
* | Increased version number to 1.12.2.0marha2012-06-151-1/+1
| |
* | Solved compile warningmarha2012-06-151-2/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-154-6/+24
|\| | | | | | | | | | | | | | | Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h
| * fontconfig mesa pixman xserver git update 15 juni 2012marha2012-06-154-6/+24
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-08175-9620/+9643
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/.gitignore libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/Window.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libxcb/src/.gitignore libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mapi/glapi/glapi_getproc.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/program/.gitignore xkbcomp/listing.c xkbcomp/xkbpath.c xorg-server/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winscrinit.c xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
| * Used synchronise script to update filesmarha2012-06-08175-9615/+9638
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-043-1/+99
|\|
| * fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4marha2012-06-043-1/+99
| | | | | | | | May 2012
* | Merge remote-tracking branch 'origin/released'marha2012-05-292-16/+85
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c
| * fontconfig libX11 mesa pixman xserver git update 29 May 2012marha2012-05-292-16/+85
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2540-158/+184
|\|
| * fontconfig xserver xkeyboard-config pixman git update 2012marha2012-05-2540-158/+184
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-213-8/+36
|\|
| * fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012marha2012-05-213-8/+36
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-155-8/+4
|\|
| * xserver mesa git update 15 May 2012marha2012-05-155-8/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-101-2/+2
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * xserver fontconfig mesa git update 10 May 2012marha2012-05-101-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-092-4/+4
|\|
| * libX11 mesa xserver xkeyboard-configmarha2012-05-092-4/+4
| |
* | Now the display number can be set to automatic by specifying -1marha2012-05-035-34/+69
| |
* | Create hidden console when calling plink, otherwise some commands willmarha2012-05-031-1/+23
| | | | | | | | exit immediately (like gnome-terminal)
* | Merge remote-tracking branch 'origin/released'marha2012-05-022-10/+22
|\| | | | | | | | | Conflicts: xorg-server/os/connection.c
| * fontconfig mesa xserver xkeyboard-config git update 2 May 2012marha2012-05-022-10/+22
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-309-180/+274
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c
| * fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012marha2012-04-309-180/+274
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-2018-31/+90
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c
| * fontconfig libX11 mesa pixman xserver git update 20 april 2012marha2012-04-2018-31/+90
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-16167-5819/+5904
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/securitysrv.h xorg-server/glx/glxext.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_size_get.c xorg-server/hw/xwin/winclip.c xorg-server/hw/xwin/winfont.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winglobals.h xorg-server/hw/xwin/winmonitors.h xorg-server/include/closestr.h xorg-server/include/pixmapstr.h xorg-server/include/servermd.h xorg-server/include/site.h xorg-server/include/windowstr.h xorg-server/include/xkbstr.h
| * libX11 xserver pixman mesa git update 16 Apr 2012marha2012-04-16167-5820/+5905
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-131-346/+480
|\|
| * fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012marha2012-04-131-346/+480
| |