aboutsummaryrefslogtreecommitdiff
path: root/pixman
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-055-35/+238
|\ | | | | | | | | | | | | | | Conflicts: pixman/Makefile.am pixman/configure.ac pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-fast-path.h
| * git update pixman 5 July 2011marha2011-07-055-35/+238
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-273-32/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac apps/xwininfo/xwininfo.c fontconfig/src/fcmatch.c mesalib/include/GL/internal/dri_interface.h mesalib/src/glsl/main.cpp mesalib/src/mesa/main/pack.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_format.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/blitters-test.c
| * xwininfo fontconfig mesa pixman git update 27 June 2011marha2011-06-273-32/+38
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-2314-3982/+3218
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/state.c mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/state_tracker/st_format.h pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-arm-neon.c pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-fast-path.h pixman/pixman/pixman.h xorg-server/configure.ac xorg-server/hw/xwin/man/XWin.man xorg-server/manpages.am
| * libX11 mesa pixman xserver git update 23 June 2011marha2011-06-2314-3982/+3218
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-014-6091/+6076
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/xkeyboard-config/NEWS xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/po/ca.po xorg-server/xkeyboard-config/po/da.po xorg-server/xkeyboard-config/po/de.po xorg-server/xkeyboard-config/po/fr.po xorg-server/xkeyboard-config/po/it.po xorg-server/xkeyboard-config/po/ko.po xorg-server/xkeyboard-config/po/nl.po xorg-server/xkeyboard-config/po/pl.po xorg-server/xkeyboard-config/po/ru.po xorg-server/xkeyboard-config/po/sv.po xorg-server/xkeyboard-config/po/uk.po
| * mesa pixman xkeyboard-config git update 1 Jun 2011marha2011-06-014-6091/+6076
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-291-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+1
| |
* | merge ^/branches/released .marha2011-05-251-2461/+2460
|\|
| * xkeyboard-config libX11 pixman mesa git update 25 May 2011marha2011-05-251-4/+3
| |
* | svn merge ^/branches/released .marha2011-05-228-658/+772
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-227-2001/+2114
| | | | | | | | May 2011
* | merge ^/branches/released .marha2011-05-181-3/+1
|\|
| * xkeyboard-config libX11 pixman mesa git update 18 May 2011marha2011-05-181-3/+1
| |
* | svn merge ^/branches/released .marha2011-05-102-1/+6
|\|
| * libfontenc pixman mesa git update 10 May 2011marha2011-05-102-1/+6
| |
* | svn merge ^/branches/released .marha2011-05-031-2/+2
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-031-2/+2
| |
* | svn merge ^/branches/released .marha2011-04-281-3/+3
|\|
* | previous change was causing ploblems in the xorg xserver, causing corrupted ↵marha2011-04-281-3/+3
| | | | | | | | display. So reverted the change.
* | svn merge ^/branches/released .marha2011-04-279-30/+1074
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-279-1853/+2897
| |
* | svn merge ^/branches/released .marha2011-04-121-65/+548
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-121-65/+548
| |
* | svn merge ^/branches/released .marha2011-04-072-7/+5
|\|
| * xserver pixman mesa git update 7 Apr 2011marha2011-04-072-2722/+2720
| |
* | svn merge ^/branches/released .marha2011-03-257-7/+140
|\|
| * git update until 25 Mar 2011marha2011-03-257-5607/+5740
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver fontconfig glproto libXau libXft libXmu libfontenc libxcb mesa mkfontscale pixman randrproto xkeyboard-config xtrans xwininfo updated following packages: xproto-7.0.21 xineramaproto-1.2.1 libXt-1.1.1 libxkbfile-1.0.7 libXpm-3.5.9 libXfont-1.4.3 libXaw-1.0.9 bdftopcf-1.0.3 encodings-1.0.4 fixesproto-5.0 font-adobe-100dpi-1.0.3 font-adobe-75dpi-1.0.3 font-adobe-utopia-100dpi-1.0.4 font-adobe-utopia-75dpi-1.0.4 font-adobe-utopia-type1-1.0.4 font-alias-1.0.3 font-arabic-misc-1.0.3 font-bh-100dpi-1.0.3 font-bh-75dpi-1.0.3 font-bh-lucidatypewriter-100dpi-1.0.3 font-bh-lucidatypewriter-75dpi-1.0.3 font-bh-ttf-1.0.3 font-bh-type1-1.0.3 font-bitstream-100dpi-1.0.3 font-bitstream-75dpi-1.0.3 font-bitstream-speedo-1.0.2 font-bitstream-type1-1.0.3 font-cronyx-cyrillic-1.0.3 font-cursor-misc-1.0.3 font-daewoo-misc-1.0.3 font-dec-misc-1.0.3 font-ibm-type1-1.0.3 font-isas-misc-1.0.3 font-jis-misc-1.0.3 font-micro-misc-1.0.3 font-misc-cyrillic-1.0.3 font-misc-ethiopic-1.0.3 font-misc-meltho-1.0.3 font-misc-misc-1.1.2 font-mutt-misc-1.0.3 font-schumacher-misc-1.1.2 font-screen-cyrillic-1.0.4 font-sony-misc-1.0.3 font-sun-misc-1.0.3 font-util-1.2.0 font-winitzki-cyrillic-1.0.3 font-xfree86-type1-1.0.4
* | svn merge ^/branches/released .marha2011-03-244-16/+51
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011marha2011-03-244-728/+763
| |
* | svn merge ^/branches/released .marha2011-03-209-3070/+2991
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-209-9398/+9319
| |
* | svn merge ^/branches/released .marha2011-03-136-560/+771
|\|
| * xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011marha2011-03-136-3877/+4088
| |
* | svn merge ^/branches/released .marha2011-03-126-12/+21
|\|
| * libX11 pixman mesa git update 12 Mar 2011marha2011-03-126-377/+386
| |
* | svn merge ^/branches/released .marha2011-03-0214-560/+1508
|\|
| * pixman mesa git update 1 Mar 2011marha2011-03-0114-2775/+3723
| |
* | svn merge ^/branches/released .marha2011-02-235-268/+5
|\|
| * xserver pixman mesa git update 23 Feb 2011marha2011-02-235-449/+186
| |
* | svn merge ^/branches/released .marha2011-02-222-1031/+572
|\|
| * xserver libX11 pixman mesa git update 22 Feb 2011marha2011-02-222-1031/+572
| |
* | svn merge ^/branches/released .marha2011-02-207-35/+659
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-207-79/+703
| |
* | svn merge ^/branches/released .marha2011-02-1622-8183/+8586
|\|
| * pixman mesa git update 16 Feb 2011marha2011-02-1622-5402/+5805
| |
* | svn merge ^/branches/released .marha2011-02-145-3747/+4086
|\|
| * xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011marha2011-02-125-3747/+4086
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 20:11:16 +0000