Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-08-07 | 70 | -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 2012 | marha | 2012-08-07 | 78 | -1563/+2252 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-03 | 40 | -464/+627 |
|\| | |||||
| * | pixman mesa git update 3 Aug 2012 | marha | 2012-08-03 | 40 | -464/+627 |
| | | |||||
* | | Synchronised with xwin master branch | marha | 2012-08-01 | 11 | -417/+435 |
| | | |||||
* | | Also export XGetWMHints | marha | 2012-08-01 | 1 | -0/+1 |
| | | |||||
* | | 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 |
| | | |||||
* | | Fixed problem in Win32TempDir of returning NULL in case TEMP env variable | marha | 2012-08-01 | 1 | -1/+1 |
| | | | | | | | | is not defined and TMP is | ||||
* | | 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 | 7 | -80/+90 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-01 | 14 | -79/+431 |
|\| | |||||
| * | git mesa update 1 Aug 2012 | marha | 2012-08-01 | 14 | -79/+431 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-31 | 157 | -4158/+4362 |
|\| | |||||
| * | fontconfig libXext mesa xserver pixman git update 31 Jul 2012 | marha | 2012-07-31 | 157 | -4158/+4362 |
| | | |||||
* | | Added autogenerated files to ignore | marha | 2012-07-31 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-18 | 54 | -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 2012 | marha | 2012-07-18 | 53 | -588/+517 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-16 | 20 | -304/+354 |
|\| | | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore | ||||
| * | libX11 mesa git update 16 Jul 2012 | marha | 2012-07-16 | 20 | -304/+354 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-13 | 64 | -1928/+3075 |
|\| | | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c | ||||
| * | xserver mesa git update 13 Jul 2012 | marha | 2012-07-13 | 56 | -338/+1323 |
| | | |||||
* | | Synchronised files | marha | 2012-07-12 | 4 | -179/+232 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-12 | 11 | -86/+287 |
|\| | |||||
| * | mesa xserver git update 12 Jul 2012 | marha | 2012-07-12 | 11 | -86/+287 |
| | | |||||
* | | synchronised files | marha | 2012-07-11 | 4 | -1728/+1772 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 20 | -214/+542 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/devices.c | ||||
| * | mesa xserver pixman git update 11 Jul 2012 | marha | 2012-07-11 | 20 | -214/+542 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 284 | -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 2012 | marha | 2012-07-10 | 282 | -30581/+8501 |
| | | |||||
* | | Solved compilation errors | marha | 2012-07-09 | 2 | -26/+28 |
| | | |||||
* | | synchronised pixman/pixman/makefile pixman/pixman/makefile.sources | marha | 2012-07-09 | 1 | -1/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-09 | 60 | -1108/+3323 |
|\| | | | | | | | | | | | 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 | 60 | -1108/+3323 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-06 | 63 | -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 2012 | marha | 2012-07-06 | 63 | -461/+2263 |
| | | |||||
* | | Solved link error | marha | 2012-07-06 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-04 | 36 | -123/+543 |
|\| | | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c | ||||
| * | mesa xserver git update 4 Jul 2012 | marha | 2012-07-04 | 36 | -123/+543 |
| | | |||||
* | | Solved compilation warnings introduced in latest merge | marha | 2012-07-02 | 1 | -0/+1 |
| | | |||||
* | | Solved compilation errors due to latest merge | marha | 2012-07-02 | 1 | -12/+15 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-02 | 26 | -427/+898 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c | ||||
| * | mesa pixman xserver git update 2 Jul 2012 | marha | 2012-07-02 | 26 | -427/+898 |
| | | |||||
* | | Solved problem of using wrong name for log file when -displayfd is used | marha | 2012-06-29 | 1 | -1/+1 |
| | | |||||
* | | Synchronised file | marha | 2012-06-29 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-29 | 39 | -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 2012 | marha | 2012-06-29 | 39 | -189/+321 |
| | | |||||
* | | Synchronised files | marha | 2012-06-28 | 9 | -77/+442 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-28 | 63 | -698/+853 |
|\| | |||||
| * | xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012 | marha | 2012-06-28 | 63 | -698/+853 |
| | |