aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/version.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-08-131-15/+14
|\
| * mesa pixman xkeyboard-config xserver git update 13 Aug 2012marha2012-08-131-15/+14
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-031-1/+1
|\|
| * pixman mesa git update 3 Aug 2012marha2012-08-031-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-311-0/+1
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-311-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-081-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-151-2/+10
|\|
| * xserver mesa git update 15 May 2012marha2012-05-151-2/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-301-0/+1
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c
| * fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012marha2012-04-301-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-261-2/+0
|\|
| * xwininfo xcb-proto mesa xserver git update 26 12 2012marha2012-01-261-2/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-171-4/+2
|\|
| * git update mesa pixman xserver 17 jan 2012marha2012-01-171-4/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-091-0/+5
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-091-0/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-1/+0
|\| | | | | | | | | | | | | | | | | 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-051-1/+0
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-301-16/+4
|\| | | | | | | | | Conflicts: openssl/Makefile
| * mesa xkeyboard-config git update 30 sep 2011marha2011-09-301-16/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-291-1/+25
|\|
| * xwininfo libXft mesa git update 29 sep 2011marha2011-09-291-1/+25
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-281-0/+25
|\|
| * mesa pixman xkeyboard-config git update 28 sep 2011marha2011-09-281-0/+25
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-271-293/+281
|\| | | | | | | | | | | | | | | | | 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-271-293/+281
| |
* | Solved compilation problemmarha2011-04-071-1/+1
|/
* xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-288/+293
|
* mesa git update 30 Mar 2011marha2011-03-301-285/+288
|
* xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-1/+2
|
* xserver and mesa git update 28-12-2010marha2010-12-281-284/+284
|
* Updated to mesalib 7.9marha2010-11-221-23/+177
|
* Updated to following packages:marha2010-04-021-0/+130
mesa-7.8