aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Removed check in Xi versionmarha2011-10-061-10/+0
|
* Added swrastwgl_dir dllsmarha2011-10-061-0/+2
|
* Do line-ending independent comparemarha2011-10-061-14/+14
|
* Merge remote-tracking branch 'origin/released'marha2011-10-0626-752/+966
|\
| * upgraded to inputproto-2.1.99.1marha2011-10-0626-752/+966
| | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011
* | Synchronised filesmarha2011-10-053-166/+175
| |
* | Added new files to projectmarha2011-10-052-0/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-05232-22715/+24367
|\| | | | | | | | | | | | | | | | | 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-05232-22716/+24368
| | | | | | | | update 5 oct 2011
* | Added swrast dll based on wglmarha2011-10-0523-6/+37126
| |
* | Solved run-time error in debug due to type castmarha2011-09-301-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-30222-2038/+3670
|\| | | | | | | | | Conflicts: openssl/Makefile
| * Upgraded to openssl-1.0.0emarha2011-09-30208-1746/+3572
| |
| * mesa xkeyboard-config git update 30 sep 2011marha2011-09-3015-293/+99
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2919-29/+109
|\|
| * xwininfo libXft mesa git update 29 sep 2011marha2011-09-2919-29/+109
| |
* | Solved pixman compilaton problemmarha2011-09-283-47/+25
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2834-18209/+20153
|\|
| * mesa pixman xkeyboard-config git update 28 sep 2011marha2011-09-2834-18209/+20153
| |
* | Do not use LockFile as a variable name since it gives a name collision withmarha2011-09-271-0/+4
| | | | | | | | microsoft header files
* | Added lower_clip_distance.cpp to project filemarha2011-09-275-304/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2764-5557/+6674
|\| | | | | | | | | | | | | | | | | 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-2764-5537/+6654
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2646-637/+751
|\| | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c
| * fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011marha2011-09-2646-637/+751
| |
* | Solved compilation errormarha2011-09-221-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-22244-56086/+53719
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-22244-56090/+53723
| |
* | 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-20102-4966/+3751
|\|
| * libX11 libxtrans mesa git update 20 sep 2011marha2011-09-20102-4966/+3751
| |
* | texfetch.* -> s_texfetch.*marha2011-09-194-4/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-19186-15362/+15513
|\| | | | | | | | | Conflicts: libfontenc/src/fontenc.c
| * xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontencmarha2011-09-19186-15361/+15512
| | | | | | | | mesa git update 19 sept 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-1627-15271/+4134
|\|
| * git update libXext libXdmcp mesa xkeyboard-config 16 sep 2011marha2011-09-1627-15271/+4134
| | | | | | | | X11/extensions: removed files that are in multiple extension modules
* | Merge remote-tracking branch 'origin/released'marha2011-09-1552-4481/+3416
|\|
| * libxtrans libXmu libXext mesa pixman git update 15 sept 2011marha2011-09-1552-4481/+3416
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-1465-4328/+56573
|\|
| * mesa git update 14 sep 2011marha2011-09-145-10/+34
| |
| * pixman git update 14 sep 2011marha2011-09-142-3/+3
| |
| * libX11 git update 14 sep 2011marha2011-09-1458-4315/+56536
| |
* | Synchronised line endinge with release branchmarha2011-09-121644-1123834/+1123834
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-1232-3649/+3875
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glcpp/glcpp.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/common/spantmp2.h mesalib/src/mesa/drivers/dri/common/utils.c mesalib/src/mesa/drivers/dri/swrast/swrast.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/Makefile.am pixman/test/utils.c pixman/test/utils.h
| * git update 12 sep 2011marha2011-09-1232-3639/+3865
| |
* | format_unpack.c addedmarha2011-09-092-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-0922-416/+2602
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/scons/gallium.py mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_variable.cpp mesalib/src/glsl/linker.cpp mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/formats.h mesalib/src/mesa/main/texcompress.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/sources.mak
| * mesa git update 9 sep 2011marha2011-09-0922-416/+2602
| |
* | ignore pch dirmarha2011-09-081-0/+1
| |