aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-08-215-15/+96
|\
| * xserver xkeyboard-config mesa pixman git update 21 Aug 2012marha2012-08-215-15/+96
| |
* | 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.
* | Synchronised filesmarha2012-08-164-1411/+1557
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-166-23/+33
|\|
| * libxcb xserver mesa git update 16 Aug 2012marha2012-08-166-23/+33
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-133-3/+6
|\|
| * mesa pixman xkeyboard-config xserver git update 13 Aug 2012marha2012-08-133-3/+6
| |
* | synchronised filesmarha2012-08-072-156/+2254
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0750-1173/+1554
|\| | | | | | | | | | | | | | | | | | | | | 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-0758-1304/+1753
| |
* | 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
| |
* | Fixed problem in Win32TempDir of returning NULL in case TEMP env variablemarha2012-08-011-1/+1
| | | | | | | | is not defined and TMP is
* | Some white space changesmarha2012-08-011-20/+24
| | | | | | | | Fixed problem of having = instead of == in if test
* | Solved compile errorsmarha2012-08-014-80/+82
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-3117-1705/+105
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-3117-1705/+105
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1836-596/+373
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1835-545/+381
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1319-1610/+1816
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-1311-20/+64
| |
* | Synchronised filesmarha2012-07-123-179/+170
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-124-4/+21
|\|
| * mesa xserver git update 12 Jul 2012marha2012-07-124-4/+21
| |
* | synchronised filesmarha2012-07-114-1728/+1772
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-113-7/+9
|\| | | | | | | | | Conflicts: xorg-server/dix/devices.c
| * mesa xserver pixman git update 11 Jul 2012marha2012-07-113-7/+9
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-11273-29444/+7095
|\| | | | | | | | | | | | | | | | | | | | | 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-10272-30513/+8293
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0939-90/+1408
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h
| * fontconfig libX11 mesa pixman xserver git update 9 Jul 2012marha2012-07-0939-90/+1408
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0650-414/+1058
|\| | | | | | | | | | | | | | | 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-0650-412/+1051
| |
* | Solved link errormarha2012-07-061-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0427-77/+467
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-0427-77/+467
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-021-1/+1
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c
| * mesa pixman xserver git update 2 Jul 2012marha2012-07-021-1/+1
| |
* | Solved problem of using wrong name for log file when -displayfd is usedmarha2012-06-291-1/+1
| |
* | Synchronised filemarha2012-06-291-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2926-133/+140
|\| | | | | | | | | | | 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-2926-117/+142
| |
* | Synchronised filesmarha2012-06-286-29/+53
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-281-6/+5
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-281-6/+5
| |
* | Solved compile problems when compiled from a clean treemarha2012-06-271-0/+4
| |
* | libXmu is now a dllmarha2012-06-271-0/+2
| | | | | | | | | | Exported variables in libX11 and libxcb should be declared with __declspec(dllimport)
* | libXext is now a dllmarha2012-06-261-4/+6
| |