aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program
Commit message (Collapse)AuthorAgeFilesLines
* Added gitignore filesmarha2011-05-301-0/+4
|
* Merge remote-tracking branch 'origin/released'marha2011-05-292-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-292-1/+3
| |
* | merge ^/branches/released .marha2011-05-121-0/+6
|\|
| * libxcb mesa xcb-proto git update 12 May 2011marha2011-05-121-0/+6
| |
* | svn merge ^/branches/released .marha2011-05-102-16/+25
|\|
| * libfontenc pixman mesa git update 10 May 2011marha2011-05-102-16/+25
| |
* | svn merge ^/branches/released .marha2011-05-091-1/+1
|\|
| * libXext libX11 mkfontscale mesa git update 9 May 2011marha2011-05-091-1/+1
| |
* | svn merge ^/branches/released .marha2011-05-032-3/+3
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-032-3/+3
| |
* | svn merge ^/branches/released .marha2011-05-023-7/+27
|\|
| * mesa git update 1 May 2011marha2011-05-023-591/+611
| |
* | svn merge ^/branches/released .marha2011-04-301-455/+517
|\|
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-301-455/+517
| |
* | 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-281-1/+5
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-1/+5
| |
* | svn merge ^/branches/released .marha2011-04-278-369/+493
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-278-1105/+1229
| |
* | svn merge ^/branches/released .marha2011-04-143-255/+295
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-143-299/+339
| |
* | svn merge ^/branches/released .marha2011-04-122-3/+3
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-122-3277/+3277
| |
* | svn merge ^/branches/released .marha2011-04-062-408/+375
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-062-4386/+4353
| |
* | svn merge ^/branches/released .marha2011-04-011-3/+14
|\|
| * libXext xserver libXmu libX11 libXdmcp xextproto libxtrans mesa git update 1 ↵marha2011-04-011-1250/+1261
| | | | | | | | Apr 2011
* | svn merge ^/branches/released .marha2011-03-306-56/+64
|\|
| * mesa git update 30 Mar 2011marha2011-03-306-5602/+5610
| |
* | svn merge ^/branches/released .marha2011-03-201-20/+0
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-201-20/+0
| |
* | svn merge ^/branches/released .marha2011-03-171-2/+2
|\|
| * xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-171-1077/+1077
| |
* | svn merge ^/branches/released .marha2011-03-151-5/+3
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-5/+3
| |
* | svn merge ^/branches/released .marha2011-03-131-1/+1
|\|
| * xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011marha2011-03-131-1/+1
| |
* | svn merge ^/branches/released .marha2011-03-124-5/+117
|\|
| * libX11 pixman mesa git update 12 Mar 2011marha2011-03-124-1081/+1193
| |
* | svn merge ^/branches/released .marha2011-03-043-3/+6
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-043-4296/+4299
| |
* | Solved build problem in mesa because dependency checking in VS in not ↵marha2011-03-022-16/+3
| | | | | | | | working like expected. Now build the lex and bison files in the same script.
* | svn merge ^/branches/released .marha2011-03-026-9627/+31
|\|
| * xkeyboard-config mesa git update 2 Mar 2011marha2011-03-024-9627/+0
| |
* | svn merge ^/branches/released .marha2011-02-221-138/+137
|\|
| * xserver libX11 pixman mesa git update 22 Feb 2011marha2011-02-221-1/+0
|/
* 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
|