aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-12-1428-3073/+3207
|\ | | | | | | | | | | | | | | | | 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-1313-157/+196
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1247-3663/+5442
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-1247-3663/+5442
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-084-7/+28
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-084-7/+28
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-0559-8612/+9014
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-0559-8612/+9014
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2950-1361/+1505
|\|
| * mesa git update 29 nov 2011marha2011-11-2950-1361/+1505
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2813-1173/+1328
|\|
| * mesa git update 28 nov 2011marha2011-11-2813-1173/+1328
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2525-545/+648
|\| | | | | | | | | | | | | | | | | | | 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-2525-545/+648
| |
* | 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-1745-5215/+4484
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-1745-5215/+4484
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1425-1343/+1079
|\| | | | | | | | | Conflicts: libX11/src/util/makekeys.c
| * libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git updatemarha2011-11-1425-1343/+1079
| | | | | | | | 14 nov 2011
* | Merge remote-tracking branch 'origin/released'marha2011-11-107-75/+773
|\|
| * libX11 mesa git update 10 nov 2011marha2011-11-107-75/+773
| |
* | Solved compile problem in debugmarha2011-11-101-2/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0953-1600/+2712
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-0953-1601/+2712
| |
* | Synchronised filesmarha2011-11-078-24/+49
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0719-2292/+2146
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * xserver pixman mesa git update 7 nov 2011marha2011-11-0719-2292/+2146
| |
* | Solved mesa compile problemsmarha2011-11-041-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-04119-15378/+14368
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-04119-15371/+14361
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-2813-1189/+1276
|\|
| * mesa git update 28 okt 2011marha2011-10-2813-1189/+1276
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-2764-665/+1434
|\|
| * mesa git update 27 okt 2011marha2011-10-279-70/+108
| |
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-2661-595/+1326
| |
* | Removed useless codemarha2011-10-271-2/+0
| |
* | Solved link problemsmarha2011-10-191-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-1962-3861/+3668
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-1962-3861/+3668
| | | | | | | | 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
* | Merge remote-tracking branch 'origin/released'marha2011-10-05134-11035/+11918
|\| | | | | | | | | | | | | | | | | 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-05134-11035/+11918
| | | | | | | | 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-2911-14/+90
|\|