aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-07-1319-1610/+1816
|\ | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-1311-20/+64
| |
* | Synchronised filesmarha2012-07-123-179/+170
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-124-4/+21
|\|
| * mesa xserver git update 12 Jul 2012marha2012-07-124-4/+21
| |
* | synchronised filesmarha2012-07-114-1728/+1772
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-113-7/+9
|\| | | | | | | | | Conflicts: xorg-server/dix/devices.c
| * mesa xserver pixman git update 11 Jul 2012marha2012-07-113-7/+9
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-11273-29444/+7095
|\| | | | | | | | | | | | | | | | | | | | | 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-10272-30513/+8293
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0939-90/+1408
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h
| * fontconfig libX11 mesa pixman xserver git update 9 Jul 2012marha2012-07-0939-90/+1408
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0650-414/+1058
|\| | | | | | | | | | | | | | | 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-0650-412/+1051
| |
* | Solved link errormarha2012-07-061-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0427-77/+467
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-0427-77/+467
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-021-1/+1
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c
| * mesa pixman xserver git update 2 Jul 2012marha2012-07-021-1/+1
| |
* | Solved problem of using wrong name for log file when -displayfd is usedmarha2012-06-291-1/+1
| |
* | Synchronised filemarha2012-06-291-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2926-133/+140
|\| | | | | | | | | | | 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-2926-117/+142
| |
* | Synchronised filesmarha2012-06-286-29/+53
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-281-6/+5
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-281-6/+5
| |
* | Solved compile problems when compiled from a clean treemarha2012-06-271-0/+4
| |
* | libXmu is now a dllmarha2012-06-271-0/+2
| | | | | | | | | | Exported variables in libX11 and libxcb should be declared with __declspec(dllimport)
* | libXext is now a dllmarha2012-06-261-4/+6
| |
* | libxcb is now a dllmarha2012-06-261-17/+21
| |
* | Made installing debug version optionalmarha2012-06-261-91/+41
| |
* | libX11 is now compiled as dllmarha2012-06-263-23/+6
| |
* | libXau is not compiled as dllmarha2012-06-251-0/+1
| |
* | The following libraries have no xserver dependent compilation anymoremarha2012-06-252-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libX11 libxcb pixman libXdmcp libXau libXfont libXfont libXfont libXfont libXfont libXfont libXfont libfontenc libXinerama
* | zlib is now compiled as a dllmarha2012-06-253-2/+9
| |
* | Synchronised filesmarha2012-06-225-1872/+2040
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2216-45/+12
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-2216-45/+12
| |
* | Synchronised filesmarha2012-06-214-1430/+1502
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-216-18/+42
|\|
| * mesa pixman xkeyboard-config xserver git update 21 Jun 2012marha2012-06-216-18/+42
| |
* | Freetype library name changed1.12.2.0marha2012-06-151-2/+2
| |
* | Increased version number to 1.12.2.0marha2012-06-152-2/+2
| |
* | Solved compile warningmarha2012-06-151-2/+8
| |
* | Syncrhonised filesmarha2012-06-154-2177/+1401
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1530-147/+652
|\| | | | | | | | | | | | | | | 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-1530-147/+652
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-08499-75196/+75310
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-08502-75223/+75424
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-047-7/+107
|\|