aboutsummaryrefslogtreecommitdiff
path: root/gl
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-11-141-8/+4
|\ | | | | | | | | | | | | | | | | * origin/released: mesa xserver pixman git update 9 nov 2013 Conflicts: mesalib/src/mesa/drivers/dri/common/dri_util.c xorg-server/Xext/shm.c
* | Solved compilation and run-time problems after latest mergemarha2013-11-083-27/+207
| |
* | Solved compilation and link problems after last mergemarha2013-11-081-8/+69
| |
* | Merge remote-tracking branch 'origin/released'marha2013-11-041-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013 Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/glapi.h xorg-server/glx/glapi_gentable.c xorg-server/glx/glapitable.h xorg-server/glx/glprocs.h xorg-server/glx/glxcmdsswap.c xorg-server/glx/glxdri.c xorg-server/glx/glxext.c xorg-server/glx/glxext.h xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_dispatch_swap.c xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/glx/indirect_texture_compression.c xorg-server/glx/render2.c xorg-server/glx/render2swap.c
| * fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013marha2013-10-311-1/+2
| | | | | | | | | | | | | | | | | | xserver commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485 libX11 commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea glproto commit aacc7a51b6161c765b04524e0d2ab31e5e586834 fontconfig commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab mesa commit b16b3c8703f198ca0f025b730d582600df79c19c
* | Synchronised opengl filesmarha2013-10-242-4/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2013-10-183-404/+414
|\| | | | | | | | | | | | | | | | | * origin/released: mesa pixman git update 18 okt 2013 Conflicts: mesalib/include/GL/glext.h mesalib/include/GL/glxext.h
* | Updated opengl spec filesmarha2013-09-182-2/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2013-09-101-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013 Conflicts: mesalib/src/glsl/.gitignore xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winsetsp.c
* | Updated to latest opengl specsmarha2013-09-051-7/+11
| |
* | Synchronised filesmarha2013-08-193-54/+336
| | | | | | | | Updated to latest gl specs
* | gen_gl_wrappers.py: now use the opengl xml files as inputmarha2013-07-222-913/+738
| |
* | Synchronised filemarha2013-07-191-0/+2
| |
* | Synchronised filesmarha2013-07-161-14/+16
| |
* | Solved mesa compilation problemsmarha2013-07-011-2/+0
| |
* | Synchronised filesmarha2013-07-013-10441/+8477
| |
* | Synchronised filesmarha2013-03-251-1/+14
| |
* | Synchronised filemarha2013-02-071-1/+31
| |
* | Synchronised filesmarha2013-01-161-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-162-2/+3
|\| | | | | | | | | | | | | * origin/released: Switched to xcalc-1.0.5 Switched to bdftopcf-1.0.4 libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config
| * libxtrans fontconfig glproto libX11 libXau libXext libXft libXineramamarha2013-01-162-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libXmu libfontenc mesa xkeyboard-config libxtrans: d9f3728ff74ceb956f6cf8dc24b38611f9a4868a fontconfig: ec5ca08c807585a9230f83c95f7cca6b7065b142 glproto: 8e3407e02980d088e20041e79bdcdd3737e7827e libX11: f57fd760cba92ad846917f21e94e73e9c846185f libXau: 1a8a1b2c68967b48c07b56142799b1020f017027 libXext: 8eee1236041d46a21faba32e0d27c26985267d89 libXft: c5e760a239afc62a1c75e0509868e35957c8df52 libXinerama: 470b9356af961ff7d3968b164aa73872b49a5dcc libXmu: 474d22468c90f99104873b4c5fd7b0f0d2cbf823 libfontenc: 0c3518df24192f18f15ce91c2868560a5973a3dc mesa: 3c00a52f7e02007f40fa53a06fad517bed0328ff xkeyboard-config: 8a117fbd4a029b952afcfe362931628dccf496e4
* | Synchronised filesmarha2012-12-031-7/+32
| |
* | Synchronised mesa filesmarha2012-11-201-13/+0
| |
* | synchronised filemarha2012-09-271-177/+117
| |
* | Synchronised gl/internal/dri_interface.hmarha2012-09-041-4/+63
| |
* | Syncrhonised filesmarha2012-09-041-10/+2
| |
* | Synchronised filesmarha2012-08-161-2/+2
| |
* | synchronised filesmarha2012-08-072-27/+1016
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-131-1/+1
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-131-1/+1
| |
* | Synchronised filesmarha2012-07-121-0/+62
| |
* | Synchronised filesmarha2012-06-282-48/+381
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-111-1/+3
|\| | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * fontconfig glproto mesa pixman git update 11 Jun 2012marha2012-06-111-1/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-081-0/+78
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/.gitignore libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/Window.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libxcb/src/.gitignore libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mapi/glapi/glapi_getproc.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/program/.gitignore xkbcomp/listing.c xkbcomp/xkbpath.c xorg-server/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winscrinit.c xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
| * Used synchronise script to update filesmarha2012-06-081-0/+78
| |
* | Update filesthatshouldbethesame.py and synchronised filesmarha2012-05-301-1/+10
| |
* | Synchronised files with mesamarha2012-03-122-3/+4
| |
* | synchronized filesmarha2012-01-301-990/+997
| |
* | Solved compilation errormarha2011-12-251-3/+71
| |
* | Synchronised filesmarha2011-12-231-0/+23
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-082-2702/+2735
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-082-2702/+2735
| |
* | Synchronised line endinge with release branchmarha2011-09-121-312/+312
| |
* | synchronised filesmarha2011-08-301-0/+3
| |
* | Synchronised filesmarha2011-08-091-3/+364
| |
* | Synchronised filesmarha2011-07-122-11049/+11132
| |
* | Synchronised filesmarha2011-06-091-0/+1
| |
* | Synchronised filesmarha2011-05-241-0/+1
| |
* | svn merge ^/branches/released .marha2011-05-222-1/+15
|\|