aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-09-171-32/+42
|\ | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
| * mesa xserver pixman git update 17 sep 2012marha2012-09-171-32/+42
| |
* | Initialize the log file a little bit earlier in the startup processmarha2012-09-051-7/+12
| |
* | Changed fatal error a littlemarha2012-09-051-5/+5
| |
* | Help message may be printed in log filemarha2012-09-051-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-052-2/+11
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver mesa git update 4 sep 2012marha2012-09-052-2/+11
| |
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-311-2/+2
| | | | | | | | git update 31 Aug 2012
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-041-2/+2
| | | | | | | | git update 31 Aug 2012
* | Increased version to 1.12.99.0marha2012-08-221-1/+1
| |
* | Solved possible crash in winMultiWindowGetClassHintmarha2012-08-211-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'marha2012-08-214-14/+95
|\|
| * xserver xkeyboard-config mesa pixman git update 21 Aug 2012marha2012-08-214-14/+95
| |
* | Do not ignore the windows keymarha2012-08-211-16/+0
| | | | | | | | | | Now the windows key can be used as meta character for emacs in multiwindow mode.
* | Merge remote-tracking branch 'origin/released'marha2012-08-162-4/+8
|\|
| * libxcb xserver mesa git update 16 Aug 2012marha2012-08-162-4/+8
| |
* | synchronised filesmarha2012-08-072-156/+2254
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0727-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 2012marha2012-08-0735-723/+891
| |
* | Synchronised with xwin master branchmarha2012-08-0111-417/+435
| |
* | winUpdateWindowPosition: do not assume WS_EX_APPWINDOW stylemarha2012-08-011-1/+1
| |
* | winProcessXEventsTimeout: improved accuracy of timeoutmarha2012-08-011-115/+104
| |
* | Some white space changesmarha2012-08-011-20/+24
| | | | | | | | Fixed problem of having = instead of == in if test
* | Solved compile errorsmarha2012-08-011-1/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-315-116/+51
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-315-116/+51
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1825-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 2012marha2012-07-1824-371/+196
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-137-5/+55
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-137-7/+48
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-124-4/+21
|\|
| * mesa xserver git update 12 Jul 2012marha2012-07-124-4/+21
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-11126-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 2012marha2012-07-10126-27695/+3208
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0923-69/+1036
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h
| * fontconfig libX11 mesa pixman xserver git update 9 Jul 2012marha2012-07-0923-69/+1036
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0614-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 2012marha2012-07-0614-133/+60
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0411-24/+27
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-0411-24/+27
| |
* | Synchronised filemarha2012-06-291-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-294-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 2012marha2012-06-294-45/+45
| |
* | Synchronised filesmarha2012-06-284-20/+44
| |
* | libX11 is now compiled as dllmarha2012-06-261-11/+3
| |
* | zlib is now compiled as a dllmarha2012-06-251-0/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2215-30/+0
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-2215-30/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-214-15/+40
|\|
| * mesa pixman xkeyboard-config xserver git update 21 Jun 2012marha2012-06-214-15/+40
| |