aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-12-1684-7243/+7447
|\ | | | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/registry.c xorg-server/include/resource.h xorg-server/os/access.c xorg-server/os/auth.c
| * xserver git update 16 dec 2011marha2011-12-1684-7227/+7431
| |
* | Added -parentprocessid command line parametermarha2011-12-161-0/+12
| |
* | Solved compilation errormarha2011-12-161-18/+18
| |
* | Synchronised filesmarha2011-12-1511-1224/+1229
| |
* | Solved compilation warning: possible use of uninitialised variablemarha2011-12-151-2/+3
| |
* | Added missing files to project filesmarha2011-12-154-8/+12
| |
* | Solved compilation errormarha2011-12-151-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1429-3085/+3251
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/gl_gentable.py mesalib/src/mapi/glapi/gen/gl_table.py
| * git update mesa 14 dec 2011marha2011-12-1417-2901/+3005
| |
| * git update pixman mesa 13 dec 2011marha2011-12-1314-169/+240
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1280-6007/+8514
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-1280-6007/+8514
| |
* | Include dix-config.h to remove warningmarha2011-12-081-0/+4
| |
* | Synchronised dix-config.h and dix-config.h.inmarha2011-12-084-79/+33
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-0840-4848/+4936
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-0840-4848/+4936
| |
* | Added missing files to projectmarha2011-12-052-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-0597-13076/+13082
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-0597-9131/+9137
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2953-1363/+1515
|\|
| * mesa git update 29 nov 2011marha2011-11-2953-1363/+1515
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2820-1273/+1449
|\|
| * mesa git update 28 nov 2011marha2011-11-2820-1273/+1449
| |
* | Solved missing compilation of strndup.cmarha2011-11-251-0/+1
| |
* | strndup.c added in makefilemarha2011-11-252-0/+14
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-25144-18592/+18853
|\| | | | | | | | | | | | | | | | | | | 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-25146-18491/+18752
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2132-2157/+2472
|\|
| * xserver xkeyboard-config mesa git update 21 nov 2011marha2011-11-2132-2157/+2472
| |
* | Added release note for 1.11.21.11.2.0marha2011-11-181-0/+719
| |
* | Bumped version to 1.11.2marha2011-11-183-3/+3
| |
* | Updated makefile with new version of freetypemarha2011-11-185-12/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1880-597/+1515
|\|
| * freetype 2.4.8marha2011-11-1880-597/+1515
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-187-2/+684
|\|
| * xkeyboard-config mesa git update 18 nov 2011marha2011-11-187-2/+684
| |
* | Removed compiling of deleted filemarha2011-11-182-4/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1757-6636/+5898
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-1757-6636/+5898
| |
* | Solved possible build problemmarha2011-11-141-2/+0
| |
* | Updated project filesmarha2011-11-144-8/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1465-4611/+4369
|\| | | | | | | | | Conflicts: libX11/src/util/makekeys.c
| * libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git updatemarha2011-11-1465-4610/+4368
| | | | | | | | 14 nov 2011
* | Freetype changed version to 2.4.7 in makefilesmarha2011-11-105-12/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1092-3627/+4333
|\|
| * Updated to freetype 2.4.7marha2011-11-1092-3627/+4333
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-109-172/+868
|\|
| * libX11 mesa git update 10 nov 2011marha2011-11-109-172/+868
| |
* | Solved compile problem in debugmarha2011-11-101-2/+1
| |