aboutsummaryrefslogtreecommitdiff
path: root/mesalib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-12-0575-8997/+9030
|\ | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-0575-8997/+9030
| |
* | 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
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2527-546/+654
|\| | | | | | | | | | | | | | | | | | | 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-2527-546/+654
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2113-225/+515
|\|
| * xserver xkeyboard-config mesa git update 21 nov 2011marha2011-11-2113-225/+515
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-183-2/+669
|\|
| * xkeyboard-config mesa git update 18 nov 2011marha2011-11-183-2/+669
| |
* | Removed compiling of deleted filemarha2011-11-182-4/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1745-5215/+4484
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-1745-5215/+4484
| |
* | Updated project filesmarha2011-11-144-8/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1427-1344/+1093
|\| | | | | | | | | Conflicts: libX11/src/util/makekeys.c
| * libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git updatemarha2011-11-1427-1344/+1093
| | | | | | | | 14 nov 2011
* | Merge remote-tracking branch 'origin/released'marha2011-11-108-76/+774
|\|
| * libX11 mesa git update 10 nov 2011marha2011-11-108-76/+774
| |
* | Solved compile problem in debugmarha2011-11-101-2/+1
| |
* | Removed deleted filemarha2011-11-092-4/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0954-1600/+2713
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-0954-1601/+2713
| |
* | Synchronised filesmarha2011-11-078-24/+49
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0723-2502/+2358
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * xserver pixman mesa git update 7 nov 2011marha2011-11-0723-2502/+2358
| |
* | Solved mesa compile problemsmarha2011-11-043-1/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-04130-15409/+14466
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
| * xserver pixman mesa git update 4 nov 2011marha2011-11-04130-15402/+14459
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-2814-1194/+1280
|\|
| * mesa git update 28 okt 2011marha2011-10-2814-1194/+1280
| |
* | Added link_uniforms.cpp to mesa project filesmarha2011-10-274-0/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-2770-671/+1575
|\|
| * mesa git update 27 okt 2011marha2011-10-279-70/+108
| |
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-2667-601/+1467
| |
* | Removed useless codemarha2011-10-271-2/+0
| |
* | Solved link problemsmarha2011-10-193-4/+5
| |
* | Added uniform_query.cpp to mesa projectmarha2011-10-192-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-1966-3867/+3728
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-1966-3867/+3728
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-1047-1943/+2976
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-1047-1943/+2976
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-0615-629/+734
|\|
| * upgraded to inputproto-2.1.99.1marha2011-10-0615-629/+734
| | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011
* | Added new files to projectmarha2011-10-052-0/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-05144-11125/+11998
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h
| * mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵marha2011-10-05144-11125/+11998
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-3014-286/+92
|\| | | | | | | | | Conflicts: openssl/Makefile
| * mesa xkeyboard-config git update 30 sep 2011marha2011-09-3014-286/+92
| |