aboutsummaryrefslogtreecommitdiff
path: root/mesalib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2913-18/+98
|\|
| * xwininfo libXft mesa git update 29 sep 2011marha2011-09-2913-18/+98
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-288-837/+909
|\|
| * mesa pixman xkeyboard-config git update 28 sep 2011marha2011-09-288-837/+909
| |
* | Added lower_clip_distance.cpp to project filemarha2011-09-275-304/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2712-548/+829
|\| | | | | | | | | | | | | | | | | 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-2712-548/+829
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2637-567/+702
|\| | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c
| * fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011marha2011-09-2637-567/+702
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2249-5722/+5999
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2249-5722/+5999
| |
* | 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-2092-4908/+3668
|\|
| * libX11 libxtrans mesa git update 20 sep 2011marha2011-09-2092-4908/+3668
| |
* | texfetch.* -> s_texfetch.*marha2011-09-194-4/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-1937-2916/+3051
|\| | | | | | | | | Conflicts: libfontenc/src/fontenc.c
| * xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontencmarha2011-09-1937-2916/+3051
| | | | | | | | mesa git update 19 sept 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-165-6/+131
|\|
| * git update libXext libXdmcp mesa xkeyboard-config 16 sep 2011marha2011-09-165-6/+131
| | | | | | | | X11/extensions: removed files that are in multiple extension modules
* | Merge remote-tracking branch 'origin/released'marha2011-09-1526-3080/+2006
|\|
| * libxtrans libXmu libXext mesa pixman git update 15 sept 2011marha2011-09-1526-3080/+2006
| |