aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/bufferobj.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-01-221-11/+0
|\ | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config Conflicts: mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/main/syncobj.h xorg-server/hw/xwin/winconfig.c xorg-server/hw/xwin/winmultiwindowwndproc.c
| * fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-configmarha2013-01-221-11/+0
| | | | | | | | | | | | | | | | | | | | fontconfig: 000ca9ccb03013a5b151f0d21148ab0ca4c2f2de libfontenc: f5d1208172e965fdd7fae8927bd3e29b3cc3a975 mesa: 148fc6d53716f39971a453792570c2b8c207efb6 mkfontscale: 547517571e695728278a264eedbac47b6e1f43bc pixman: 2c6577476e5b18e17904ae8af244a39c352e2e33 xserver: 70b127c9f1c53bdb42f078265e67f76b464deae2 xkeyboard-config: 6b35b1b43d2fdff30f530d7cf65fffd6c3504690
* | Merge remote-tracking branch 'origin/released'marha2013-01-161-28/+25
|\| | | | | | | | | | | | | * origin/released: Switched to xcalc-1.0.5 Switched to bdftopcf-1.0.4 libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config
| * libxtrans fontconfig glproto libX11 libXau libXext libXft libXineramamarha2013-01-161-28/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libXmu libfontenc mesa xkeyboard-config libxtrans: d9f3728ff74ceb956f6cf8dc24b38611f9a4868a fontconfig: ec5ca08c807585a9230f83c95f7cca6b7065b142 glproto: 8e3407e02980d088e20041e79bdcdd3737e7827e libX11: f57fd760cba92ad846917f21e94e73e9c846185f libXau: 1a8a1b2c68967b48c07b56142799b1020f017027 libXext: 8eee1236041d46a21faba32e0d27c26985267d89 libXft: c5e760a239afc62a1c75e0509868e35957c8df52 libXinerama: 470b9356af961ff7d3968b164aa73872b49a5dcc libXmu: 474d22468c90f99104873b4c5fd7b0f0d2cbf823 libfontenc: 0c3518df24192f18f15ce91c2868560a5973a3dc mesa: 3c00a52f7e02007f40fa53a06fad517bed0328ff xkeyboard-config: 8a117fbd4a029b952afcfe362931628dccf496e4
* | Merge remote-tracking branch 'origin/released'marha2012-12-171-2/+2
|\| | | | | | | | | | | | | | | * origin/released: libXft pixman mesa git update 17 dec 2012 Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast.c
| * libXft pixman mesa git update 17 dec 2012marha2012-12-171-2/+2
| | | | | | | | | | | | libXft: 835cd2a6cb4aa8f89e6e7dead66483643a6e7ee8 pixman: 526dc06e5694172abf979c03a5cf530207fe2d27 mesa: 1358f3a905448f6fb546aba951e317f743a83c76
* | Merge remote-tracking branch 'origin/released'marha2012-12-101-10/+12
|\| | | | | | | | | | | | | | | * origin/released: fontconfig libX11 mesa pixman git update 10 dec 2012 Conflicts: fontconfig/src/fcxml.c
| * fontconfig libX11 mesa pixman git update 10 dec 2012marha2012-12-101-10/+12
| | | | | | | | | | | | | | libX11 9833489e6c3829a1e835bc0a11f028fc180809e4 mesa 17f5dc57306b8f5079304701e455bf4b927d3cae pixman 8ca4e144724ba2041bc5ef077ccf6d24e7cf4d1f fontconfig 608c5b590bd3428dfcd30f3d68ee8b7131e2f019
* | Merge remote-tracking branch 'origin/released'marha2012-11-191-20/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: git update 19 nov 2012 Added bash script to update released branch Conflicts: mesalib/src/mapi/glapi/gen/gl_API.xml mesalib/src/mesa/program/.gitignore pixman/pixman/pixman-mmx.c xorg-server/Xi/xiquerypointer.c xorg-server/xkb/xkb.c
| * git update 19 nov 2012marha2012-11-191-20/+20
| | | | | | | | | | | | | | | | | | fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7 xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
* | Merge remote-tracking branch 'origin/released'marha2012-11-071-33/+2
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 7 nov 2012 Conflicts: mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mesa/main/.gitignore xkbcomp/listing.c xorg-server/hw/xwin/winshaddd.c xorg-server/hw/xwin/winshadddnl.c
| * xserver mesa xkbcomp git update 7 nov 2012marha2012-11-071-33/+2
| | | | | | | | | | | | xserver: 011f8458805e443ac9130865d2840a929a00cabf xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4 mesa: f42518962a08ce927e4ddd233d19d2661e135834
* | Merge remote-tracking branch 'origin/released'marha2012-11-071-9/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 5 nov 2012 Conflicts: mesalib/src/glsl/.gitignore mesalib/src/mesa/main/.gitignore xorg-server/Xi/chgdctl.c xorg-server/dix/getevents.c xorg-server/hw/xwin/winprefs.c xorg-server/os/utils.c
| * xserver mesa xkbcomp git update 5 nov 2012marha2012-11-051-9/+15
| | | | | | | | | | | | xserver: a194630f7f7b287cb4ea4a459df0745f4c0d4c1a mesa: ccbfe3dde94cd50a4e6468cfeabf95c79c9d8072 xkbcomp: a68c5b7b29eb1433b1be73b50c4248e10eab8e64
* | Merge remote-tracking branch 'origin/released'marha2012-10-251-0/+3
|\| | | | | | | | | * origin/released: fontconfig mesa pixman git update
| * fontconfig mesa pixman git updatemarha2012-10-251-0/+3
| | | | | | | | | | | | fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822 mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0
* | Merge remote-tracking branch 'origin/released'marha2012-10-171-6/+16
|\| | | | | | | | | * origin/released: pixman mesa git update 17 oct 2012
| * pixman mesa git update 17 oct 2012marha2012-10-171-6/+16
| | | | | | | | | | pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956 mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13
* | Merge remote-tracking branch 'origin/released'marha2012-10-011-1/+3
|\| | | | | | | | | | | | | | | * origin/released: libxcb mesa pixman xkeyboard-config git update 1 oct 2012 Conflicts: libxcb/src/man/.gitignore
| * libxcb mesa pixman xkeyboard-config git update 1 oct 2012marha2012-10-011-1/+3
| | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5
* | Merge remote-tracking branch 'origin/released'marha2012-09-171-5/+0
|\| | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
| * mesa xserver pixman git update 17 sep 2012marha2012-09-171-5/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-061-2/+1
|\|
| * xserver mesa git update 6 sep 2012marha2012-09-061-2/+1
| |
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-311-0/+4
| | | | | | | | git update 31 Aug 2012
| * xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-08-271-9/+41
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-041-0/+4
| | | | | | | | git update 31 Aug 2012
* | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-09-041-9/+41
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | Merge remote-tracking branch 'origin/released'marha2012-08-161-3/+103
|\|
| * libxcb xserver mesa git update 16 Aug 2012marha2012-08-161-3/+103
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-131-12/+32
|\|
| * mesa pixman xkeyboard-config xserver git update 13 Aug 2012marha2012-08-131-12/+32
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-031-2/+2
|\|
| * pixman mesa git update 3 Aug 2012marha2012-08-031-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-291-1/+1
|\| | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/indirect.c
| * xkeyboard-config xserver pixman mesa git update 29 Jun 2012marha2012-06-291-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-281-4/+7
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-281-4/+7
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-221-0/+240
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-221-0/+240
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-121-0/+10
|\|
| * fontconfig mesa pixman git update 12 Juni 2012marha2012-06-121-0/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-111-10/+10
|\| | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * fontconfig glproto mesa pixman git update 11 Jun 2012marha2012-06-111-10/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-081-0/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+19
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-131-0/+30
|\|
| * fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012marha2012-04-131-0/+30
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-051-6/+6
|\|
| * libfontenc xserver pixman mesa git update 5 Mar 2012marha2012-03-051-6/+6
| | | | | | | | | | | | | | font-util-1.3.0 xclock-1.0.6 libXfont-1.4.5 inputproto-2.2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 15:52:20 +0000