aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-01-0678-1946/+2109
|\ | | | | | | | | | | Conflicts: mesalib/src/glsl/link_uniforms.cpp mesalib/src/mesa/drivers/dri/common/drisw_util.c
| * libX11 mesa pixman git update 6 jan 2012marha2012-01-0679-1948/+2111
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2935-1636/+1751
|\|
| * xserver libX11 mesa xkeyboard-config git update 28 dec 2011marha2011-12-2835-1636/+1751
| |
* | Increaser version of swrastmarha2011-12-291-1/+1
| |
* | Solved compilation errormarha2011-12-252-3/+73
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2544-6984/+4210
|\|
| * mesa xkeyboard-config xserver git update 25 dec 2011marha2011-12-2544-6984/+4210
| |
* | Solved compilation errorsmarha2011-12-232-2/+2
| |
* | Solved compilation error due to name conflictmarha2011-12-232-0/+8
| |
* | Synchronised filesmarha2011-12-2332-159/+161
| |
* | Solved error in comparison scriptmarha2011-12-231-5/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-234-11/+21
|\|
| * Updated to inputproto-2.1.99.4marha2011-12-234-21/+21
| |
* | Solved compile errormarha2011-12-231-1/+1
| |
* | Back previous versionmarha2011-12-232-0/+2
| |
* | Removed unneeded source filemarha2011-12-231-1/+0
| |
* | Solved compile warningmarha2011-12-231-1/+1
| |
* | synchronised filesmarha2011-12-233-27/+24
| |
* | Added new sources to makefilesmarha2011-12-232-4/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2387-4876/+8582
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/mi/mieq.c
| * git mesa pixman xserver xkeyboard-config update 24 dec 2011marha2011-12-2394-12365/+26767
| |
* | Solved compilation warnings1.11.3.0marha2011-12-172-2/+4
| |
* | Make sure the correct bison is usedmarha2011-12-171-1/+1
| |
* | Added release note for 1.11.3.0marha2011-12-171-0/+734
| |
* | Increased version to 1.11.3.0marha2011-12-173-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1765-1767/+2414
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-1765-1767/+2414
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1684-7243/+7447
|\| | | | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/registry.c xorg-server/include/resource.h xorg-server/os/access.c xorg-server/os/auth.c
| * xserver git update 16 dec 2011marha2011-12-1684-7227/+7431
| |
* | Added -parentprocessid command line parametermarha2011-12-161-0/+12
| |
* | Solved compilation errormarha2011-12-161-18/+18
| |
* | Synchronised filesmarha2011-12-1511-1224/+1229
| |
* | Solved compilation warning: possible use of uninitialised variablemarha2011-12-151-2/+3
| |
* | Added missing files to project filesmarha2011-12-154-8/+12
| |
* | Solved compilation errormarha2011-12-151-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1429-3085/+3251
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/gl_gentable.py mesalib/src/mapi/glapi/gen/gl_table.py
| * git update mesa 14 dec 2011marha2011-12-1417-2901/+3005
| |
| * git update pixman mesa 13 dec 2011marha2011-12-1314-169/+240
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1280-6007/+8514
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-1280-6007/+8514
| |
* | Include dix-config.h to remove warningmarha2011-12-081-0/+4
| |
* | Synchronised dix-config.h and dix-config.h.inmarha2011-12-084-79/+33
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-0840-4848/+4936
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-0840-4848/+4936
| |
* | Added missing files to projectmarha2011-12-052-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-0597-13076/+13082
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-0597-9131/+9137
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2953-1363/+1515
|\|
| * mesa git update 29 nov 2011marha2011-11-2953-1363/+1515
| |