aboutsummaryrefslogtreecommitdiff
path: root/mesalib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-05-3010-1401/+1457
|\ | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/state_tracker/st_cb_blit.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.c
| * mesa git update 30 May 2011marha2011-05-3010-1401/+1457
| |
* | Added gitignore filesmarha2011-05-303-0/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-3015-5602/+5602
|\|
| * Synchronised files. The revision number was removedmarha2011-05-3015-5602/+5602
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-2918-2239/+2630
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH08.xml mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/queryobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_readpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mkfontscale/list.h pixman/pixman/Makefile.win32 xorg-server/dix/devices.c xorg-server/dix/events.c xorg-server/dix/inpututils.c xorg-server/fb/fbbltone.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xfree86/common/xf86Module.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xfree86/man/xorg.conf.man xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmouse.c xorg-server/include/input.h xorg-server/include/inputstr.h xorg-server/mi/mieq.c xorg-server/randr/rrscreen.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in
| * libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011marha2011-05-2918-2857/+3248
| |
* | merge ^/branches/released .marha2011-05-252-1006/+570
|\|
| * xkeyboard-config libX11 pixman mesa git update 25 May 2011marha2011-05-252-2643/+2207
| |
* | merge ^/branches/released .marha2011-05-244-6/+9
|\|
| * xserver mesa git update 24 May 2011marha2011-05-244-3117/+3120
| |
* | svn merge ^/branches/released .marha2011-05-2224-2829/+10724
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-2225-16963/+24855
| | | | | | | | May 2011
* | merge ^/branches/released .marha2011-05-184-23/+23
|\|
| * xkeyboard-config libX11 pixman mesa git update 18 May 2011marha2011-05-184-3208/+3208
| |
* | merge ^/branches/released .marha2011-05-1610-190/+283
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-1610-1708/+1801
| |
* | merge ^/branches/released .marha2011-05-133-354/+355
|\|
| * mesa git update 13 May 2011marha2011-05-133-2/+3
| |
* | merge ^/branches/released .marha2011-05-122-3/+9
|\|
| * libxcb mesa xcb-proto git update 12 May 2011marha2011-05-122-3/+9
| |
* | svn merge ^/branches/released .marha2011-05-107-17/+41
|\|
| * libfontenc pixman mesa git update 10 May 2011marha2011-05-107-17/+41
| |
* | svn merge ^/branches/released .marha2011-05-0914-14/+127
|\|
| * libXext libX11 mkfontscale mesa git update 9 May 2011marha2011-05-0914-2806/+2919
| |
* | svn merge ^/branches/released .marha2011-05-062-4/+14
|\|
| * glproto mesa git update 6 May 2011marha2011-05-062-12/+22
| |
* | Bumped version to 1.10.11.10.1marha2011-05-054-4/+5
|\| | | | | | | | | | | Added release note svn merge ^/branches/released .
| * libX11 libxcb mesa git update 5 May 2011marha2011-05-054-627/+628
| |
* | svn merge ^/branches/released .marha2011-05-043-110/+1
|\|
| * libX11 mesa glproto git update 4 May 2011marha2011-05-043-110/+1
| |
* | svn merge ^/branches/released .marha2011-05-0319-1702/+1917
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-0319-4125/+4340
| |
* | svn merge ^/branches/released .marha2011-05-029-48/+29
|\|
| * mesa git update 1 May 2011marha2011-05-029-9861/+9842
| |
* | svn merge ^/branches/released .marha2011-04-30156-497/+35428
|\|
| * Added extra needed filesmarha2011-04-30133-0/+34328
| |
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-3025-34749/+35352
| |
* | Synchronised filesmarha2011-04-291-4/+2
| |
* | svn merge ^/branches/released .marha2011-04-291-0/+7
|\|
| * xserver mesa git update 28 Apr 2011marha2011-04-291-1089/+1096
| |
* | svn merge ^/branches/released .marha2011-04-288-9/+42
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-288-798/+831
| |
* | svn merge ^/branches/released .marha2011-04-27104-25669/+26420
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-27110-34840/+30715
| |
* | svn merge ^/branches/released .marha2011-04-1517-1913/+2458
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-1517-5571/+6116
| |
* | svn merge ^/branches/released .marha2011-04-1413-2169/+2208
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-1413-2609/+2648
| |
* | svn merge ^/branches/released .marha2011-04-1252-7747/+10416
|\|