Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-28 | 29 | -882/+1142 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winkeybd.h xorg-server/hw/xwin/winkeynames.h xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winprefs.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwndproc.c | |||||
| * | mesa xserver git update 28 jan 2012 | marha | 2012-01-28 | 29 | -882/+1142 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-26 | 25 | -617/+705 | |
|\| | ||||||
| * | xwininfo xcb-proto mesa xserver git update 26 12 2012 | marha | 2012-01-26 | 25 | -617/+705 | |
| | | ||||||
* | | Removed deleted file from project | marha | 2012-01-25 | 2 | -4/+0 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-25 | 61 | -5508/+1413 | |
|\| | ||||||
| * | mesa git update 25 jan 2012 | marha | 2012-01-25 | 61 | -5508/+1413 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-24 | 10 | -40/+388 | |
|\| | | | | | | | | | Conflicts: xorg-server/dix/grabs.c | |||||
| * | libX11 mesa xserver git update 24 jan 2012 | marha | 2012-01-24 | 10 | -40/+388 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-23 | 27 | -675/+283 | |
|\| | ||||||
| * | git update libX11 mesa libxcb xkeyboard-config 23 jan 2012 | marha | 2012-01-23 | 27 | -675/+283 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-20 | 30 | -292/+348 | |
|\| | ||||||
| * | xserver xkeyboard-config git update 20 jan 2012 | marha | 2012-01-20 | 30 | -292/+348 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-17 | 8 | -134/+156 | |
|\| | ||||||
| * | git update mesa pixman xserver 17 jan 2012 | marha | 2012-01-17 | 8 | -134/+156 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-13 | 55 | -644/+931 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c | |||||
| * | libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012 | marha | 2012-01-13 | 55 | -644/+931 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-11 | 38 | -722/+1442 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-trap.c xorg-server/Xext/xace.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/include/dixstruct.h xorg-server/os/connection.c | |||||
| * | mesa pixman xserver git update 11 jan 2012 | marha | 2012-01-11 | 38 | -722/+1442 | |
| | | ||||||
* | | Removed deleted file from project | marha | 2012-01-10 | 2 | -4/+0 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-09 | 33 | -1010/+358 | |
|\| | ||||||
| * | xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011 | marha | 2012-01-09 | 33 | -1010/+358 | |
| | | ||||||
* | | Solved compile problem | marha | 2012-01-06 | 1 | -1/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-06 | 74 | -1925/+2082 | |
|\| | | | | | | | | | | | Conflicts: mesalib/src/glsl/link_uniforms.cpp mesalib/src/mesa/drivers/dri/common/drisw_util.c | |||||
| * | libX11 mesa pixman git update 6 jan 2012 | marha | 2012-01-06 | 75 | -1927/+2084 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-29 | 27 | -1217/+1213 | |
|\| | ||||||
| * | xserver libX11 mesa xkeyboard-config git update 28 dec 2011 | marha | 2011-12-28 | 27 | -1217/+1213 | |
| | | ||||||
* | | Increaser version of swrast | marha | 2011-12-29 | 1 | -1/+1 | |
| | | ||||||
* | | Solved compilation error | marha | 2011-12-25 | 1 | -0/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-25 | 42 | -6762/+3678 | |
|\| | ||||||
| * | mesa xkeyboard-config xserver git update 25 dec 2011 | marha | 2011-12-25 | 42 | -6762/+3678 | |
| | | ||||||
* | | Solved compilation errors | marha | 2011-12-23 | 1 | -1/+1 | |
| | | ||||||
* | | Back previous version | marha | 2011-12-23 | 1 | -0/+1 | |
| | | ||||||
* | | synchronised files | marha | 2011-12-23 | 1 | -1/+0 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 25 | -513/+869 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/mi/mieq.c | |||||
| * | git mesa pixman xserver xkeyboard-config update 24 dec 2011 | marha | 2011-12-23 | 25 | -513/+869 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-17 | 58 | -1660/+2216 | |
|\| | ||||||
| * | libX11 libxtrans mesa xserver git update 17 dec 2011 | marha | 2011-12-17 | 58 | -1660/+2216 | |
| | | ||||||
* | | Synchronised files | marha | 2011-12-15 | 1 | -2/+4 | |
| | | ||||||
* | | Added missing files to project files | marha | 2011-12-15 | 4 | -8/+12 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-14 | 28 | -3073/+3207 | |
|\| | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/gl_gentable.py mesalib/src/mapi/glapi/gen/gl_table.py | |||||
| * | git update mesa 14 dec 2011 | marha | 2011-12-14 | 17 | -2901/+3005 | |
| | | ||||||
| * | git update pixman mesa 13 dec 2011 | marha | 2011-12-13 | 13 | -157/+196 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-12 | 47 | -3663/+5442 | |
|\| | ||||||
| * | libxtrans libX11 libxcb xserver mesa git update 12 dec 2011 | marha | 2011-12-12 | 47 | -3663/+5442 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-08 | 4 | -7/+28 | |
|\| | ||||||
| * | git update glproto libX11 libxcb mesa xserver 8 dec 2011 | marha | 2011-12-08 | 4 | -7/+28 | |
| | | ||||||
* | | Added missing files to project | marha | 2011-12-05 | 2 | -0/+4 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-05 | 75 | -8997/+9030 | |
|\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | |||||
| * | xserver xkeyboard-config mesa git update 5 dec 2011 | marha | 2011-12-05 | 75 | -8997/+9030 | |
| | |