aboutsummaryrefslogtreecommitdiff
path: root/gl
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-222-2688/+2702
| | | | | | | | May 2011
* | svn merge ^/branches/released .marha2011-05-061-2/+2
|\|
| * glproto mesa git update 6 May 2011marha2011-05-061-2/+2
| |
* | svn merge ^/branches/released .marha2011-05-042-15/+15
|\|
| * libX11 mesa glproto git update 4 May 2011marha2011-05-042-3/+3
| |
* | svn merge ^/branches/released .marha2011-03-2512-16810/+2999
|\|
| * git update until 25 Mar 2011marha2011-03-2512-13914/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver fontconfig glproto libXau libXft libXmu libfontenc libxcb mesa mkfontscale pixman randrproto xkeyboard-config xtrans xwininfo updated following packages: xproto-7.0.21 xineramaproto-1.2.1 libXt-1.1.1 libxkbfile-1.0.7 libXpm-3.5.9 libXfont-1.4.3 libXaw-1.0.9 bdftopcf-1.0.3 encodings-1.0.4 fixesproto-5.0 font-adobe-100dpi-1.0.3 font-adobe-75dpi-1.0.3 font-adobe-utopia-100dpi-1.0.4 font-adobe-utopia-75dpi-1.0.4 font-adobe-utopia-type1-1.0.4 font-alias-1.0.3 font-arabic-misc-1.0.3 font-bh-100dpi-1.0.3 font-bh-75dpi-1.0.3 font-bh-lucidatypewriter-100dpi-1.0.3 font-bh-lucidatypewriter-75dpi-1.0.3 font-bh-ttf-1.0.3 font-bh-type1-1.0.3 font-bitstream-100dpi-1.0.3 font-bitstream-75dpi-1.0.3 font-bitstream-speedo-1.0.2 font-bitstream-type1-1.0.3 font-cronyx-cyrillic-1.0.3 font-cursor-misc-1.0.3 font-daewoo-misc-1.0.3 font-dec-misc-1.0.3 font-ibm-type1-1.0.3 font-isas-misc-1.0.3 font-jis-misc-1.0.3 font-micro-misc-1.0.3 font-misc-cyrillic-1.0.3 font-misc-ethiopic-1.0.3 font-misc-meltho-1.0.3 font-misc-misc-1.1.2 font-mutt-misc-1.0.3 font-schumacher-misc-1.1.2 font-screen-cyrillic-1.0.4 font-sony-misc-1.0.3 font-sun-misc-1.0.3 font-util-1.2.0 font-winitzki-cyrillic-1.0.3 font-xfree86-type1-1.0.4
* | svn merge ^/branches/released .marha2011-02-091-881/+889
|\|
* | svn merge ^/branches/released .marha2011-02-041-1/+8
|\|
* | svn merge ^/branches/released .marha2011-01-281-873/+874
|\|
* | svn merge ^/branches/released .marha2011-01-161-864/+873
|\|
* | Synchronised filemarha2011-01-091-2/+12
| |
* | svn merge ^/branches/released .marha2010-12-294-13375/+13350
|\|
* | svn merge ^/branches/released .marha2010-11-294-125/+1154
|\|
* | svn merge ^/branches/released .marha2010-10-0512-1795/+1898
|\|
| * Update to the following packages:marha2010-10-0513-2136/+1926
| | | | | | | | | | | | | | | | | | | | | | | | - glproto-1.4.12 - kbproto-1.0.5 - renderproto-0.11.1 - xclock-1.0.5 - xextproto-7.1.2 - xproto-7.0.18 - xwininfo-1.1.0
* | Synchronised filesmarha2010-07-292-1595/+2215
| |
* | Synchronised gl\glxext.h and mesalib\include\gl\glxext.hmarha2010-06-161-103/+106
| |
* | svn merge -r524:HEAD "^/branches/released" .marha2010-04-126-9/+149
| |
* | Synchronised gl\glx_mangle.h mesalib\include\gl\glx_mangle.hmarha2010-03-071-0/+1
| |
* | svn merge ^/branches/releasedmarha2010-01-0912-54/+7584
|\|
| * Updated to glproto-1.4.11marha2010-01-0912-54/+7584
| |
* | Made files that should be the same same againmarha2010-01-053-7/+349
| |
* | Opengl is working now.marha2009-10-097-873/+2335
| |
* | Made files the same that should be the same.marha2009-09-171-33/+28
| | | | | | | | | | Added batch fiesl for checking that these files are the same.
* | svn merge file:///D:/svnrepos/vcxsrv/branches/released .marha2009-07-2513-865/+1924
|\|
| * Added:marha2009-07-2513-865/+1924
| | | | | | | | | | | | | | | | | | | | | | | | fixesproto-4.1.tar.gz glproto-1.4.10.tar.gz inputproto-1.9.99.15.tar.gz randrproto-1.3.0.tar.gz renderproto-0.11.tar.gz xextproto-7.0.99.3.tar.gz xproto-7.0.15.tar.gz
* | Changes for VC compilationmarha2009-07-127-0/+11754
|/
* Added glproto-1.4.9.tar.gzmarha2009-07-1216-0/+8908