Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-09-24 | 18 | -131/+103 |
|\ | | | | | | | | | | | | | | | | | * origin/released: mesa pixman xserver git update 24 sep 2012 Conflicts: pixman/pixman/pixman-sse2.c xorg-server/dix/window.c | ||||
| * | mesa pixman xserver git update 24 sep 2012 | marha | 2012-09-24 | 18 | -131/+103 |
| | | | | | | | | | | | | xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24 pixman: c4b69e706e63e01fbc70e0026c2079007c89de14 mesa: c432c86e6aeebeb46c028af940224c59faa16e88 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-20 | 3 | -2/+11 |
|\| | | | | | | | | | | | | | | | * origin/released: libxcb xserver pixman mesa git update 20 sep 2012 Conflicts: libxcb/src/xcb_conn.c | ||||
| * | libxcb xserver pixman mesa git update 20 sep 2012 | marha | 2012-09-20 | 3 | -2/+11 |
| | | | | | | | | | | | | | | libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345 pixman: 3124a51abb89475b8c5045bc96e04c5852694a16 mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-17 | 1 | -32/+42 |
|\| | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c | ||||
| * | mesa xserver pixman git update 17 sep 2012 | marha | 2012-09-17 | 1 | -32/+42 |
| | | |||||
* | | Initialize the log file a little bit earlier in the startup process | marha | 2012-09-05 | 1 | -7/+12 |
| | | |||||
* | | Changed fatal error a little | marha | 2012-09-05 | 1 | -5/+5 |
| | | |||||
* | | Help message may be printed in log file | marha | 2012-09-05 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-05 | 2 | -2/+11 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| * | xserver mesa git update 4 sep 2012 | marha | 2012-09-05 | 2 | -2/+11 |
| | | |||||
| * | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-08-31 | 1 | -2/+2 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-09-04 | 1 | -2/+2 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | Increased version to 1.12.99.0 | marha | 2012-08-22 | 1 | -1/+1 |
| | | |||||
* | | Solved possible crash in winMultiWindowGetClassHint | marha | 2012-08-21 | 1 | -7/+14 |
| | | | | | | | | | | It seems that the class name is not always null terminated. (Seen by running the contiki cooja simulator in multiwindow mode) | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-21 | 4 | -14/+95 |
|\| | |||||
| * | xserver xkeyboard-config mesa pixman git update 21 Aug 2012 | marha | 2012-08-21 | 4 | -14/+95 |
| | | |||||
* | | Do not ignore the windows key | marha | 2012-08-21 | 1 | -16/+0 |
| | | | | | | | | | | Now the windows key can be used as meta character for emacs in multiwindow mode. | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-16 | 2 | -4/+8 |
|\| | |||||
| * | libxcb xserver mesa git update 16 Aug 2012 | marha | 2012-08-16 | 2 | -4/+8 |
| | | |||||
* | | synchronised files | marha | 2012-08-07 | 2 | -156/+2254 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-07 | 27 | -593/+693 |
|\| | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winmultiwindowicons.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/hw/xwin/winwindow.h | ||||
| * | mesa xserver xkeyboard-config git update 7 Aug 2012 | marha | 2012-08-07 | 35 | -723/+891 |
| | | |||||
* | | Synchronised with xwin master branch | marha | 2012-08-01 | 11 | -417/+435 |
| | | |||||
* | | winUpdateWindowPosition: do not assume WS_EX_APPWINDOW style | marha | 2012-08-01 | 1 | -1/+1 |
| | | |||||
* | | winProcessXEventsTimeout: improved accuracy of timeout | marha | 2012-08-01 | 1 | -115/+104 |
| | | |||||
* | | Some white space changes | marha | 2012-08-01 | 1 | -20/+24 |
| | | | | | | | | Fixed problem of having = instead of == in if test | ||||
* | | Solved compile errors | marha | 2012-08-01 | 1 | -1/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-31 | 5 | -116/+51 |
|\| | |||||
| * | fontconfig libXext mesa xserver pixman git update 31 Jul 2012 | marha | 2012-07-31 | 5 | -116/+51 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-18 | 25 | -422/+188 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore xorg-server/Xext/panoramiX.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwndproc.c | ||||
| * | fontconfig mesa xserver git update 18 Jul 2012 | marha | 2012-07-18 | 24 | -371/+196 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-13 | 7 | -5/+55 |
|\| | | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c | ||||
| * | xserver mesa git update 13 Jul 2012 | marha | 2012-07-13 | 7 | -7/+48 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-12 | 4 | -4/+21 |
|\| | |||||
| * | mesa xserver git update 12 Jul 2012 | marha | 2012-07-12 | 4 | -4/+21 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 126 | -27695/+3208 |
|\| | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/shm.c xorg-server/Xext/sync.c xorg-server/Xext/xf86bigfont.c xorg-server/Xi/opendev.c xorg-server/dix/dispatch.c xorg-server/include/globals.h xorg-server/mi/miinitext.c | ||||
| * | fontconfig mesa xserver git update 10 Jul 2012 | marha | 2012-07-10 | 126 | -27695/+3208 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-09 | 23 | -69/+1036 |
|\| | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h | ||||
| * | fontconfig libX11 mesa pixman xserver git update 9 Jul 2012 | marha | 2012-07-09 | 23 | -69/+1036 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-06 | 14 | -133/+60 |
|\| | | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/privates.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/src/kinput.c | ||||
| * | randrproto fontconfig mesa xserver git update 6 Jul 2012 | marha | 2012-07-06 | 14 | -133/+60 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-04 | 11 | -24/+27 |
|\| | | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c | ||||
| * | mesa xserver git update 4 Jul 2012 | marha | 2012-07-04 | 11 | -24/+27 |
| | | |||||
* | | Synchronised file | marha | 2012-06-29 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-29 | 4 | -61/+43 |
|\| | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/indirect.c | ||||
| * | xkeyboard-config xserver pixman mesa git update 29 Jun 2012 | marha | 2012-06-29 | 4 | -45/+45 |
| | | |||||
* | | Synchronised files | marha | 2012-06-28 | 4 | -20/+44 |
| | | |||||
* | | libX11 is now compiled as dll | marha | 2012-06-26 | 1 | -11/+3 |
| | | |||||
* | | zlib is now compiled as a dll | marha | 2012-06-25 | 1 | -0/+3 |
| | |