aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program/ir_to_mesa.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-05-291-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-291-1/+2
| |
* | svn merge ^/branches/released .marha2011-05-101-2/+11
|\|
| * libfontenc pixman mesa git update 10 May 2011marha2011-05-101-2/+11
| |
* | svn merge ^/branches/released .marha2011-05-021-3/+2
|\|
| * mesa git update 1 May 2011marha2011-05-021-3/+2
| |
* | svn merge ^/branches/released .marha2011-04-121-2/+2
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-121-3276/+3276
|/
* xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-3309/+3276
|
* mesa git update 30 Mar 2011marha2011-03-301-3332/+3309
|
* xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-201-20/+0
|
* xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-5/+3
|
* libX11 pixman mesa git update 12 Mar 2011marha2011-03-121-0/+58
|
* xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-2/+28
|
* xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011marha2011-02-121-3267/+3270
|
* libX11 mesa git update 9 Feb 2011marha2011-02-091-7/+40
|
* libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-011-21/+21
|
* pixman and mesalib git update 27 jan 2011marha2011-01-271-34/+54
|
* mesa xkeyboard-config git update 26 jan 2011marha2011-01-261-3210/+3214
|
* mesalib git update 16/1/2011marha2011-01-161-0/+5
|
* mesalib git update 14/1/2011marha2011-01-151-0/+131
|
* xserver and mesa git update 28-12-2010marha2010-12-281-2965/+3074
|
* Added missing needed files for mesalibmarha2010-11-231-0/+2965