Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 1 | -14/+11 |
|\ | | | | | | | | | Conflicts: xorg-server/include/os.h | ||||
| * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 1 | -14/+11 |
| | | | | | | | | xkeyboard-config git update 19 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 1 | -16/+76 |
|\| | | | | | | | | | | | | | | | | | 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 | 1 | -16/+76 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-27 | 1 | -67/+106 |
|\| | | | | | | | | | | | | | | | | | 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 | 1 | -67/+106 |
| | | |||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 1 | -6061/+6061 |
| | | |||||
* | | Solved compile error | marha | 2011-06-15 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-15 | 1 | -21/+86 |
|\| | | | | | | | | | | | | | | | | | | | | | 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 | -21/+86 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-08 | 1 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 1 | -3/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-05-29 | 1 | -3/+4 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 1 | -263/+401 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 1 | -263/+401 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 1 | -1/+0 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 1 | -1/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-24 | 1 | -5/+5 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011 | marha | 2011-03-24 | 1 | -5/+5 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 1 | -5819/+5858 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 1 | -69/+108 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-21 | 1 | -5825/+5819 |
|\| | |||||
| * | xserver mesa xkbcomp libxcb git update 21 jan 2011 | marha | 2011-01-21 | 1 | -5819/+5813 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 1 | -14/+1 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 1 | -14/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-12 | 1 | -1/+1 |
|\| | |||||
| * | xserver git update 10/12/2010 | marha | 2010-12-10 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-10-14 | 1 | -43/+33 |
|\| | |||||
| * | xserver git update 14/10/2010 | marha | 2010-10-14 | 1 | -43/+33 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-07-07 | 1 | -9/+3 |
|\| | |||||
| * | git update 7/7/2010 | marha | 2010-07-07 | 1 | -9/+3 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-07-01 | 1 | -50/+2 |
|\| | |||||
| * | git update 1/7/2010 | marha | 2010-07-01 | 1 | -50/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-11 | 1 | -151/+139 |
|\| | |||||
| * | xserver git update 11/6/2010 | marha | 2010-06-11 | 1 | -150/+138 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-05-20 | 1 | -15/+11 |
|\| | |||||
| * | xserver git update 20/5/2010 | marha | 2010-05-20 | 1 | -15/+11 |
| | | |||||
| * | xserver git update 15/5/2010 | marha | 2010-05-15 | 1 | -5912/+5912 |
| | | |||||
| * | xserver git update 4/5/2010 | marha | 2010-05-04 | 1 | -21/+20 |
| | | |||||
| * | git update 27/4/2010 | marha | 2010-04-27 | 1 | -1/+0 |
| | | |||||
| * | git update 16/4/2010 | marha | 2010-04-16 | 1 | -2/+6 |
| | | |||||
| * | Updated to xorg-server-1.7.99.902 | marha | 2010-03-22 | 1 | -0/+36 |
| | | |||||
* | | Solved crash in closing down | marha | 2010-05-18 | 1 | -1/+4 |
| | | |||||
* | | svn merge -r588:HEAD ^/branches/released . | marha | 2010-05-16 | 1 | -5915/+5915 |
| | | |||||
* | | svn merge -r571:HEAD "^/branches/released" . | marha | 2010-05-05 | 1 | -21/+20 |
| | | |||||
* | | svn merge -r549:HEAD "^/branches/released" . | marha | 2010-04-27 | 1 | -1/+0 |
| | | |||||
* | | svn merge -r534:HEAD ^/branches/released . | marha | 2010-04-16 | 1 | -2/+6 |
| | | |||||
* | | svn merge -c505 ^/branches/released . | marha | 2010-03-22 | 1 | -0/+36 |
| | | |||||
* | | svn merge "^/branches/released" .1.7.99.902 | marha | 2010-03-18 | 1 | -27/+1 |
|\| | | | | | | | | | increased version number |