aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-11-2515-112/+185
|\ | | | | | | | | | | | | | | | | | | 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-2515-112/+185
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-219-170/+218
|\|
| * xserver xkeyboard-config mesa git update 21 nov 2011marha2011-11-219-170/+218
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1737-4926/+4033
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-1737-4926/+4033
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1418-1225/+968
|\| | | | | | | | | Conflicts: libX11/src/util/makekeys.c
| * libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git updatemarha2011-11-1418-1225/+968
| | | | | | | | 14 nov 2011
* | Merge remote-tracking branch 'origin/released'marha2011-11-105-10/+263
|\|
| * libX11 mesa git update 10 nov 2011marha2011-11-105-10/+263
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0937-1386/+1699
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-0937-1386/+1699
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0715-601/+440
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * xserver pixman mesa git update 7 nov 2011marha2011-11-0715-601/+440
| |
* | Solved mesa compile problemsmarha2011-11-041-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0478-10693/+8923
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0478-10686/+8916
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-286-946/+979
|\|
| * mesa git update 28 okt 2011marha2011-10-286-946/+979
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-2745-451/+952
|\|
| * mesa git update 27 okt 2011marha2011-10-277-61/+99
| |
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-2643-390/+853
| |
* | Removed useless codemarha2011-10-271-2/+0
| |
* | Solved link problemsmarha2011-10-191-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-1945-1605/+1382
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-1945-1605/+1382
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-1034-513/+888
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-1034-513/+888
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-0613-519/+611
|\|
| * upgraded to inputproto-2.1.99.1marha2011-10-0613-519/+611
| | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-05118-10639/+11410
|\| | | | | | | | | | | | | | | | | 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-05118-10639/+11410
| | | | | | | | 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
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-299-13/+84
|\|
| * xwininfo libXft mesa git update 29 sep 2011marha2011-09-299-13/+84
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-286-129/+197
|\|
| * mesa pixman xkeyboard-config git update 28 sep 2011marha2011-09-286-129/+197
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-279-391/+314
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/version.c xorg-server/include/globals.h xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/os/utils.c
| * libX11 pixman mesa xserver git update 27 sep 2011marha2011-09-279-391/+314
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2620-380/+404
|\| | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c
| * fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011marha2011-09-2620-380/+404
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2236-4099/+4047
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c
| * libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011marha2011-09-2236-4099/+4047
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-211-0/+119
|\|
| * libxtrans libX11 libXext mesa git update 21 sep 2011marha2011-09-211-0/+119
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2027-4761/+3643
|\|
| * libX11 libxtrans mesa git update 20 sep 2011marha2011-09-2027-4761/+3643
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-1931-2740/+2873
|\| | | | | | | | | Conflicts: libfontenc/src/fontenc.c
| * xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontencmarha2011-09-1931-2740/+2873
| | | | | | | | mesa git update 19 sept 2011