aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-08-0770-1432/+2053
|\ | | | | | | | | | | | | | | | | | | | | 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-0778-1563/+2252
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0340-464/+627
|\|
| * pixman mesa git update 3 Aug 2012marha2012-08-0340-464/+627
| |
* | Synchronised with xwin master branchmarha2012-08-0111-417/+435
| |
* | Also export XGetWMHintsmarha2012-08-011-0/+1
| |
* | 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-017-80/+90
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0114-79/+431
|\|
| * git mesa update 1 Aug 2012marha2012-08-0114-79/+431
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-31157-4158/+4362
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-31157-4158/+4362
| |
* | Added autogenerated files to ignoremarha2012-07-311-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1854-639/+509
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1853-588/+517
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1620-304/+354
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore
| * libX11 mesa git update 16 Jul 2012marha2012-07-1620-304/+354
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1364-1928/+3075
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-1356-338/+1323
| |
* | Synchronised filesmarha2012-07-124-179/+232
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1211-86/+287
|\|
| * mesa xserver git update 12 Jul 2012marha2012-07-1211-86/+287
| |
* | synchronised filesmarha2012-07-114-1728/+1772
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1120-214/+542
|\| | | | | | | | | Conflicts: xorg-server/dix/devices.c
| * mesa xserver pixman git update 11 Jul 2012marha2012-07-1120-214/+542
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-11284-29513/+7305
|\| | | | | | | | | | | | | | | | | | | | | 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-10282-30581/+8501
| |
* | Solved compilation errorsmarha2012-07-092-26/+28
| |
* | synchronised pixman/pixman/makefile pixman/pixman/makefile.sourcesmarha2012-07-091-1/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0960-1108/+3323
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h
| * fontconfig libX11 mesa pixman xserver git update 9 Jul 2012marha2012-07-0960-1108/+3323
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0663-463/+2270
|\| | | | | | | | | | | | | | | 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-0663-461/+2263
| |
* | Solved link errormarha2012-07-061-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0436-123/+543
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-0436-123/+543
| |
* | Solved compilation warnings introduced in latest mergemarha2012-07-021-0/+1
| |
* | Solved compilation errors due to latest mergemarha2012-07-021-12/+15
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0226-427/+898
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c
| * mesa pixman xserver git update 2 Jul 2012marha2012-07-0226-427/+898
| |
* | 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-2939-205/+319
|\| | | | | | | | | | | 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-2939-189/+321
| |
* | Synchronised filesmarha2012-06-289-77/+442
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2863-698/+853
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-2863-698/+853
| |