Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-02-22 | 1 | -12/+18 |
|\ | |||||
| * | fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012 | marha | 2012-02-22 | 1 | -12/+18 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-13 | 2 | -121/+120 |
|\| | |||||
| * | libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012 | marha | 2012-02-13 | 2 | -121/+120 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-11 | 2 | -11/+11 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-trap.c xorg-server/Xext/xace.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/include/dixstruct.h xorg-server/os/connection.c | ||||
| * | mesa pixman xserver git update 11 jan 2012 | marha | 2012-01-11 | 2 | -11/+11 |
| | | |||||
* | | Solved compile error | marha | 2011-12-23 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 7 | -24/+1121 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-12-23 | 7 | -24/+1121 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-16 | 9 | -87/+88 |
|\| | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-12-16 | 9 | -87/+88 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-12 | 7 | -90/+146 |
|\| | |||||
| * | libxtrans libX11 libxcb xserver mesa git update 12 dec 2011 | marha | 2011-12-12 | 7 | -90/+146 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-08 | 1 | -2/+2 |
|\| | |||||
| * | git update glproto libX11 libxcb mesa xserver 8 dec 2011 | marha | 2011-12-08 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-05 | 2 | -23/+48 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| * | xserver xkeyboard-config mesa git update 5 dec 2011 | marha | 2011-12-05 | 2 | -23/+48 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 2 | -4/+4 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c | ||||
| * | mesa xserver pixman git update 25 nov 2011 | marha | 2011-11-25 | 2 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-17 | 2 | -5/+5 |
|\| | | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c | ||||
| * | xserver mesa git update 17 nov 2011 | marha | 2011-11-17 | 2 | -5/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 2 | -8/+19 |
|\| | |||||
| * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 2 | -8/+19 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 5 | -11/+134 |
|\| | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h | ||||
| * | mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵ | marha | 2011-10-05 | 5 | -11/+134 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-27 | 2 | -9/+10 |
|\| | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/version.c xorg-server/include/globals.h xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/os/utils.c | ||||
| * | libX11 pixman mesa xserver git update 27 sep 2011 | marha | 2011-09-27 | 2 | -9/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 50 | -4510/+4291 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c | ||||
| * | libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011 | marha | 2011-09-22 | 50 | -4513/+4294 |
| | | |||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 14 | -6402/+6402 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-15 | 1 | -28/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/news.html mesalib/docs/relnotes.html mesalib/src/mesa/state_tracker/st_atom_blend.c mesalib/src/mesa/state_tracker/st_draw.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/include/dix.h | ||||
| * | mesa xserver git update 15 June 2011 | marha | 2011-06-15 | 1 | -27/+1 |
| | | |||||
* | | __func__ is not defined in VC | marha | 2011-06-08 | 1 | -1/+1 |
| | | | | | | | | Replace it by the __FUNCTION__ macro | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-08 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/AppC.xml libX11/specs/libX11/AppD.xml libX11/specs/libX11/CH02.xml libX11/specs/libX11/CH03.xml libX11/specs/libX11/CH04.xml libX11/specs/libX11/CH05.xml libX11/specs/libX11/CH06.xml libX11/specs/libX11/CH07.xml libX11/specs/libX11/CH08.xml libX11/specs/libX11/CH09.xml libX11/specs/libX11/CH11.xml libX11/specs/libX11/CH13.xml libX11/specs/libX11/CH14.xml libX11/specs/libX11/CH15.xml libX11/specs/libX11/CH16.xml mesalib/src/mesa/main/fbobject.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/test/input.c xorg-server/xkb/xkbfmisc.c | ||||
| * | xserver libX11 mesa git update 8 Jun 2011 | marha | 2011-06-08 | 1 | -2/+2 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 3 | -227/+233 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 3 | -104/+110 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 1 | -2/+0 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 1 | -2/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 4 | -12/+19 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 4 | -315/+322 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-05 | 5 | -10/+20 |
|\| | |||||
| * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 5 | -371/+381 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 4 | -413/+240 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 4 | -563/+390 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 2 | -4/+4 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 2 | -309/+309 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-10 | 2 | -1310/+1310 |
|\| | |||||
| * | xserver mesa git update 10 Mar 2011 | marha | 2011-03-10 | 2 | -85/+85 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 6 | -2402/+2399 |
|\| |