aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-06-15295-3065/+4359
|\ | | | | | | | | | | Conflicts: freetype/src/raster/ftraster.c openssl/Makefile
| * Updated to following packages:marha2012-06-15296-3068/+4362
| | | | | | | | | | | | freetype-2.4.10 libXaw-1.0.11 openssl-1.0.1c
* | Solved compilation error in fontconfigmarha2012-06-151-3/+0
| |
* | Solved compile warningmarha2012-06-151-2/+8
| |
* | Syncrhonised filesmarha2012-06-154-2177/+1401
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-15127-1789/+2725
|\| | | | | | | | | | | | | | | 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-15127-1789/+2727
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-12152-2722/+648
|\|
| * fontconfig mesa pixman git update 12 Juni 2012marha2012-06-12150-2699/+621
| |
| * Fixed some minor mistakes in sync scriptsmarha2012-06-112-26/+30
| |
* | Synchronised makefile with Makefile.sourcesmarha2012-06-111-27/+34
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1130-180/+1663
|\| | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * fontconfig glproto mesa pixman git update 11 Jun 2012marha2012-06-1130-180/+1663
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-081702-295549/+297643
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081707-295539/+297667
| |
* | Solved lstat not defined error when linking with fontconfigmarha2012-06-041-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-0448-680/+964
|\|
| * fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4marha2012-06-0448-680/+964
| | | | | | | | May 2012
* | Added empty include files, just to avoid including non existing filesmarha2012-06-044-0/+0
| |
* | Added typedefs for off_t gid_t uid_tmarha2012-06-041-0/+3
| |
* | Only define MAXPATHLEN when not defined yetmarha2012-06-041-0/+6
| |
* | Update filesthatshouldbethesame.py and synchronised filesmarha2012-05-304-4/+26
| |
* | dispatch.h glapitable.h enums.c are now generated automaticallymarha2012-05-302-1/+16
| |
* | Only define INLINE when it is not defined yetmarha2012-05-301-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-3037-118857/+17519
|\|
| * mesa xkeyboard-config git update 30 May 2012marha2012-05-3037-118857/+17519
| |
* | fontconfig: solved compile warnings and link errors.marha2012-05-294-3/+81
| |
* | Solved compilation errorsmarha2012-05-291-10/+14
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2920-246/+798
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c
| * fontconfig libX11 mesa pixman xserver git update 29 May 2012marha2012-05-2920-243/+802
| |
* | Updated mesa project filesmarha2012-05-294-0/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2579-381/+757
|\|
| * fontconfig xserver xkeyboard-config pixman git update 2012marha2012-05-2579-381/+757
| |
* | Solved compilation errorsmarha2012-05-251-3/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2166-1179/+2000
|\|
| * fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012marha2012-05-2166-1179/+2000
| |
* | Updated mesa project filemarha2012-05-164-8/+8
| |
* | Solved compilation problemmarha2012-05-151-2/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-1584-1964/+2323
|\|
| * xserver mesa git update 15 May 2012marha2012-05-1529-333/+193
| |
| * fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012marha2012-05-1455-1631/+2130
| |
* | Solved compile warningmarha2012-05-101-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-107-66/+112
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * xserver fontconfig mesa git update 10 May 2012marha2012-05-107-65/+112
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-0956-576/+1136
|\|
| * libX11 mesa xserver xkeyboard-configmarha2012-05-0948-548/+1001
| |
| * xserver mesa git update 3 May 2012marha2012-05-039-28/+135
| |
* | Made sure that the number of maximum clients is back at 1024marha2012-05-043-3/+6
| |
* | Now the display number can be set to automatic by specifying -1marha2012-05-035-34/+69
| |
* | When -displayfd specified, assume it is a handle to shared memory to writemarha2012-05-031-0/+7
| | | | | | | | the display id to.