aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-01-2363-3592/+3580
|\
| * git update libX11 mesa libxcb xkeyboard-config 23 jan 2012marha2012-01-2363-3592/+3580
| |
* | Currenlty enable the keyboard options grab:break_actions by default.marha2012-01-201-0/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2049-12242/+14712
|\|
| * xserver xkeyboard-config git update 20 jan 2012marha2012-01-2049-12242/+14712
| |
* | Implemented prgrbs ungrab clsgrb and prwins actionsmarha2012-01-201-0/+32
| | | | | | | | | | Now the active grabs can be ungrapped with CTRL+ALT+NKP/ and CTRL+ALT+NKP* (also kill clients)
* | UngrabAllDevices: only close client when kill_client is set to TRUEmarha2012-01-201-3/+2
| | | | | | | | make sure the ungrab happens
* | Added 2 more wheele eventsmarha2012-01-201-17/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1722-561/+797
|\|
| * git update mesa pixman xserver 17 jan 2012marha2012-01-1722-561/+797
| |
* | Solved compile errorsmarha2012-01-133-5/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1392-5493/+5942
|\| | | | | | | | | | | | | | | | | | | | | | | 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 2012marha2012-01-1392-5463/+5912
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-112-1/+2
|\|
| * Switched to inputproto-2.1.99.5marha2012-01-112-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1199-4571/+5364
|\| | | | | | | | | | | | | | | | | | | | | | | 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 2012marha2012-01-11101-4503/+5286
| |
* | Removed deleted file from projectmarha2012-01-102-4/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-0944-1254/+661
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-0944-1254/+661
| |
* | Solved compile problemmarha2012-01-061-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-0678-1946/+2109
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/link_uniforms.cpp mesalib/src/mesa/drivers/dri/common/drisw_util.c
| * libX11 mesa pixman git update 6 jan 2012marha2012-01-0679-1948/+2111
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2935-1636/+1751
|\|
| * xserver libX11 mesa xkeyboard-config git update 28 dec 2011marha2011-12-2835-1636/+1751
| |
* | Increaser version of swrastmarha2011-12-291-1/+1
| |
* | Solved compilation errormarha2011-12-252-3/+73
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2544-6984/+4210
|\|
| * mesa xkeyboard-config xserver git update 25 dec 2011marha2011-12-2544-6984/+4210
| |
* | Solved compilation errorsmarha2011-12-232-2/+2
| |
* | Solved compilation error due to name conflictmarha2011-12-232-0/+8
| |
* | Synchronised filesmarha2011-12-2332-159/+161
| |
* | Solved error in comparison scriptmarha2011-12-231-5/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-234-11/+21
|\|
| * Updated to inputproto-2.1.99.4marha2011-12-234-21/+21
| |
* | Solved compile errormarha2011-12-231-1/+1
| |
* | Back previous versionmarha2011-12-232-0/+2
| |
* | Removed unneeded source filemarha2011-12-231-1/+0
| |
* | Solved compile warningmarha2011-12-231-1/+1
| |
* | synchronised filesmarha2011-12-233-27/+24
| |
* | Added new sources to makefilesmarha2011-12-232-4/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2387-4876/+8582
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011marha2011-12-2394-12365/+26767
| |
* | Solved compilation warnings1.11.3.0marha2011-12-172-2/+4
| |
* | Make sure the correct bison is usedmarha2011-12-171-1/+1
| |
* | Added release note for 1.11.3.0marha2011-12-171-0/+734
| |
* | Increased version to 1.11.3.0marha2011-12-173-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1765-1767/+2414
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-1765-1767/+2414
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1684-7243/+7447
|\| | | | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/registry.c xorg-server/include/resource.h xorg-server/os/access.c xorg-server/os/auth.c