Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 6 | -1545/+1542 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-20 | 2 | -2/+2 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 2011 | marha | 2011-02-20 | 2 | -2/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-21 | 3 | -3493/+3497 |
|\| | |||||
| * | xserver mesa xkbcomp libxcb git update 21 jan 2011 | marha | 2011-01-21 | 3 | -3484/+3488 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 3 | -164/+175 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 3 | -164/+175 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-08 | 1 | -2/+4 |
|\| | |||||
| * | xserver pixman git update 7-12-2010 | marha | 2010-12-07 | 1 | -2/+4 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-11-15 | 10 | -506/+443 |
|\| | | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c | ||||
| * | xserver pixman libX11 libXext 14/11/2010 | marha | 2010-11-14 | 10 | -503/+443 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-11-04 | 1 | -2/+2 |
|\| | |||||
| * | xserver git update 4/11/2010 | marha | 2010-11-04 | 1 | -2/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-11 | 1 | -2/+1 |
|\| | |||||
| * | xserver git update 11/9/2010 | marha | 2010-09-11 | 1 | -2/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-08-18 | 1 | -0/+6 |
|\| | |||||
| * | libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010 | marha | 2010-08-18 | 1 | -0/+6 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-07-07 | 1 | -15/+12 |
|\| | |||||
| * | git update 7/7/2010 | marha | 2010-07-07 | 1 | -15/+12 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-11 | 13 | -629/+624 |
|\| | |||||
| * | xserver git update 11/6/2010 | marha | 2010-06-11 | 13 | -628/+623 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-05-27 | 1 | -1/+1 |
|\| | |||||
| * | xserver git update 27/5/2010 | marha | 2010-05-27 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-05-26 | 1 | -246/+246 |
|\| | |||||
| * | xserver git update 26/5/2010 | marha | 2010-05-26 | 1 | -246/+246 |
| | |