Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-12-08 | 1 | -0/+1 |
|\ | |||||
| * | git update glproto libX11 libxcb mesa xserver 8 dec 2011 | marha | 2011-12-08 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 5 | -41/+329 |
|\| | | | | | | | | | | | | | | | | | 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 | -41/+329 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-27 | 5 | -1259/+1207 |
|\| | | | | | | | | | | | | | | | | | 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 | 5 | -1259/+1207 |
| | | |||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 1 | -335/+335 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-08-01 | 1 | -5/+15 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/glsl_types.cpp mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texparam.c xorg-server/config/udev.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/hw/dmx/dmxinit.c xorg-server/hw/kdrive/src/kdrive.c xorg-server/hw/xfree86/common/xf86Config.c xorg-server/hw/xfree86/common/xf86Configure.c xorg-server/hw/xfree86/common/xf86Helper.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/common/xf86Option.c xorg-server/hw/xfree86/common/xf86Priv.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/xlaunch/config.cc xorg-server/hw/xwin/xlaunch/config.h xorg-server/hw/xwin/xlaunch/main.cc xorg-server/hw/xwin/xlaunch/resources/dialog.rc xorg-server/hw/xwin/xlaunch/resources/resources.h xorg-server/hw/xwin/xlaunch/resources/resources.rc xorg-server/hw/xwin/xlaunch/resources/strings.rc xorg-server/hw/xwin/xlaunch/window/util.cc xorg-server/hw/xwin/xlaunch/window/util.h xorg-server/hw/xwin/xlaunch/window/wizard.h xorg-server/include/os.h xorg-server/os/log.c xorg-server/xkeyboard-config/symbols/lv | ||||
| * | mesa xserver pixman xkeyboard-config git update 1 aug 2011 | marha | 2011-08-01 | 1 | -5/+15 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 1 | -0/+4 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 1 | -321/+325 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 2 | -6/+6 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 2 | -6/+6 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 1 | -6/+13 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 1 | -6/+13 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-12 | 2 | -13/+14 |
|\| | |||||
| * | xserver git update 10/12/2010 | marha | 2010-12-10 | 2 | -13/+14 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-11-30 | 1 | -0/+2 |
|\| | |||||
| * | libXext xserver libfontenc libX11 libxcb pixman git update 26 11 2010 | marha | 2010-11-26 | 1 | -0/+2 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-11-15 | 3 | -108/+96 |
|\| | | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c | ||||
| * | xserver pixman libX11 libXext 14/11/2010 | marha | 2010-11-14 | 3 | -108/+96 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-11 | 1 | -17/+9 |
|\| | |||||
| * | xserver git update 11/9/2010 | marha | 2010-09-11 | 1 | -17/+9 |
| | | |||||
* | | include unistd.h where strdup is used. | marha | 2010-06-20 | 1 | -4/+0 |
| | | |||||
* | | Solved compiler warnings | marha | 2010-06-14 | 1 | -0/+4 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-14 | 4 | -16/+16 |
|\| | |||||
| * | xserver git update 14/6/2010 | marha | 2010-06-14 | 4 | -16/+16 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-11 | 5 | -81/+348 |
|\| | |||||
| * | xserver git update 11/6/2010 | marha | 2010-06-11 | 5 | -81/+348 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-05-27 | 2 | -2/+2 |
|\| | |||||
| * | xserver git update 27/5/2010 | marha | 2010-05-27 | 2 | -2/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-05-26 | 2 | -2/+2 |
|\| | |||||
| * | xserver git update 26/5/2010 | marha | 2010-05-26 | 2 | -2/+2 |
| | | |||||
| * | xserver git update 15/5/2010 | marha | 2010-05-15 | 4 | -1495/+1495 |
| | | |||||
| * | Removed files not in the git repository | marha | 2010-04-28 | 2 | -792/+40 |
| | | |||||
| * | git update 16/4/2010 | marha | 2010-04-16 | 2 | -3/+35 |
| | | |||||
| * | Updated to following packages: | marha | 2010-04-02 | 3 | -10/+47 |
| | | | | | | | | | | pixman-0.18.0 xorg-server-1.8.0 | ||||
| * | xserver and xkeyboard-config git update 30/3/2010 | marha | 2010-03-30 | 1 | -2/+5 |
| | | |||||
| * | Updated to xorg-server-1.7.99.902 | marha | 2010-03-22 | 1 | -0/+3 |
| | | |||||
* | | svn merge -r588:HEAD ^/branches/released . | marha | 2010-05-16 | 4 | -1495/+1495 |
| | | |||||
* | | svn merge -r554:HEAD "^/branches/released" . | marha | 2010-04-28 | 2 | -792/+40 |
| | | |||||
* | | svn merge -r534:HEAD ^/branches/released . | marha | 2010-04-16 | 2 | -3/+35 |
| | | |||||
* | | svn merge -r522:HEAD ^/branches/released . | marha | 2010-04-02 | 3 | -10/+47 |
| | | |||||
* | | svn merge -r516:HEAD ^/branches/released . | marha | 2010-03-30 | 1 | -2/+5 |
| | | |||||
* | | svn merge -c505 ^/branches/released . | marha | 2010-03-22 | 1 | -0/+3 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-02-15 | 1 | -6/+0 |
|\| | |||||
| * | Git update 15/2/2010 | marha | 2010-02-15 | 1 | -6/+0 |
| | | |||||
* | | svn merge ^/branches/released | marha | 2010-02-14 | 4 | -56/+56 |
|\| | |||||
| * | Updated to xorg-server-1.7.99.901 | marha | 2010-02-14 | 4 | -56/+56 |
| | | |||||
* | | svn merge ^/branches/released | marha | 2010-01-05 | 7 | -74/+434 |
|\| |