aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw
Commit message (Collapse)AuthorAgeFilesLines
* Solved problem of logverbosity parameter not taking into accountmarha2013-03-191-0/+1
|
* Merge remote-tracking branch 'origin/released'marha2013-03-061-14/+31
|\ | | | | | | | | * origin/released: fontconfig libfontenc mesa xserver git update 6 Mar 2013
| * fontconfig libfontenc mesa xserver git update 6 Mar 2013marha2013-03-061-14/+31
| | | | | | | | | | | | | | xserver commit 103b77c59e3638a45179bf6d7908f5c738d2d872 libfontenc commit 624508365ec3279bc74ce523d024533e062629e1 fontconfig commit e96d7760886a3781a46b3271c76af99e15cb0146 mesa commit 88b20d58344ed336b146799c0bf1149a932dc2d7
* | Merge remote-tracking branch 'origin/released'marha2013-03-043-13/+34
|\| | | | | | | | | | | | | | | | | * origin/released: fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013 Conflicts: libX11/src/xkb/XKBGAlloc.c libX11/src/xkb/XKBMisc.c
| * fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013marha2013-03-043-13/+34
| | | | | | | | | | | | | | | | | | xserver commit 8f4640bdb9d3988148e09a08d2c7e3bab1d538d6 xkeyboard-config commit fa2f330df22511c3846cb1cb0760551c6e244a81 libX11 commit c23d61d1b84dca3740bf4786978c7908d0065fb9 pixman commit 5feda20fc39407879993ed4a6d861ef7f78d9432 fontconfig commit 612ee2a5c91b8929b2cc5abce4af84d8d7e66bd0 mesa commit e29124717eae4f8d329bb6a9707b802c0ff4bdd9
* | Removed code that should not have been theremarha2013-02-151-5/+0
| | | | | | | | Probably added in here by some invalid merge
* | Merge remote-tracking branch 'origin/released'marha2013-02-151-0/+4
|\| | | | | | | | | * origin/released: libxcb mesa xserver xkeyboard-config git update 15 Feb 2013
| * libxcb mesa xserver xkeyboard-config git update 15 Feb 2013marha2013-02-151-0/+4
| | | | | | | | | | | | | | xserver commit 90642948cc78834d95f7a3bddaac7ff77b68ed7e libxcb commit 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13 xkeyboard-config commit 067b0e4fd8d4fe707d86b24ae83bcacb61624231 mesa commit 6dbe94c12cd1b3b912a7083055178e0dfd7372af
* | Removed executable bit from source filesmarha2013-02-138-0/+0
| |
* | Increased version to 1.13.2.0marha2013-02-131-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-133-17/+62
|\| | | | | | | | | * origin/released: mesa pixman xserver git update 13 Feb 2013
| * mesa pixman xserver git update 13 Feb 2013marha2013-02-133-17/+62
| | | | | | | | | | | | xserver commit 7115f6c709898a5124b67e19c61dc01334471358 pixman commit 5e207f825bd1ed3142a623bcbceca00508907c5e mesa commit 8cabe26f5dc4c66ae59649cfd7b25f761cda250b
* | Merge remote-tracking branch 'origin/released'marha2013-02-113-7/+7
|\| | | | | | | | | * origin/released: xserver mesa git update 11 Feb 2013
| * xserver mesa git update 11 Feb 2013marha2013-02-113-7/+7
| | | | | | | | | | xserver commit c1602d1c17967bdd4db9db19b3a9c0dfca6a58aa mesa commit 990bd49fba7d539e950bdda6eb9819a9abf14850
* | Merge remote-tracking branch 'origin/released'marha2013-01-2213-87/+172
|\| | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config Conflicts: mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/main/syncobj.h xorg-server/hw/xwin/winconfig.c xorg-server/hw/xwin/winmultiwindowwndproc.c
| * fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-configmarha2013-01-2214-84/+170
| | | | | | | | | | | | | | | | | | | | fontconfig: 000ca9ccb03013a5b151f0d21148ab0ca4c2f2de libfontenc: f5d1208172e965fdd7fae8927bd3e29b3cc3a975 mesa: 148fc6d53716f39971a453792570c2b8c207efb6 mkfontscale: 547517571e695728278a264eedbac47b6e1f43bc pixman: 2c6577476e5b18e17904ae8af244a39c352e2e33 xserver: 70b127c9f1c53bdb42f078265e67f76b464deae2 xkeyboard-config: 6b35b1b43d2fdff30f530d7cf65fffd6c3504690
* | xlaunch: Use dialog for prompting for password input instead of consolemarha2013-01-173-47/+103
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-111-4/+11
|\| | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013 Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/.gitignore mesalib/src/mesa/program/.gitignore
| * fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013marha2013-01-111-4/+11
| | | | | | | | | | | | | | | | fontconfig: 0831c1770e4bac7269a190936bbb0529d747e233 libX11: 0b148750027fd0557c5ed93afda861ddf4b92e0f mkfontscale: 9cbe3256bc932b82f2435b23cda0931f4f5f5ba2 xserver: 6703a7c7cf1a349c137e247a0c8eb462ff7b07be mesa: babab2876080af0fe65249dff559244aebd0b87e
* | Merge remote-tracking branch 'origin/released'marha2013-01-0743-394/+335
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013 Conflicts: fontconfig/src/fcatomic.c pixman/pixman/pixman-mmx.c pixman/pixman/pixman-sse2.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/wincursor.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winsetsp.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/xfixes/cursor.c
| * pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git ↵marha2013-01-0743-395/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | update 7 jan 2013 fontconfig: 17eda89ed2e24a3fc5f68538dd7fd9ada8efb087 xserver: bd91b05b631f13afd1f7a9d6cbc4f0c5408b523a xkeyboard-config: 4779e2745094ebe0c06364b4099d7067ae750d07 libX11: cd25cab4b5b957641183ce72dd1ae0424aff1663 libXau: e04364efccbb3bb4cfc5f4cb491ffa1faaaacbdb mesa: afec10df373f342f058aab66c622237964a4a147 pixman: 35cc965514ca6e665c18411fcf66db826d559c2a xkbcomp: e4f767913338052527538d429931e8abd8c3fb88
* | Merge remote-tracking branch 'origin/released'marha2012-12-183-10/+6
|\| | | | | | | | | * origin/released: xserver mesa git update 18 oct 2012
| * xserver mesa git update 18 oct 2012marha2012-12-183-10/+6
| | | | | | | | | | xserver: 3420a7778c7d5eaa638327f31dd460554c257bb1 mesa: dc613f11ddf1f3a6e10c2d99830fb1a84fdb55b2
* | Solved problem of prompt not being shown in Windows Xpmarha2012-12-101-14/+14
| |
* | Removed executable bit from source files1.13.1.0marha2012-12-0612-0/+0
| |
* | Updated version to 1.13.1.0marha2012-12-051-1/+1
| | | | | | | | Added release note
* | Now you are able to enter the password when using a private key with amarha2012-12-041-154/+194
| | | | | | | | password
* | Merge remote-tracking branch 'origin/released'marha2012-12-031-0/+2
|\| | | | | | | | | * origin/released: fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012
| * fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012marha2012-12-031-0/+2
| | | | | | | | | | | | | | | | fontconfig: 2442d611579bccb84f0c29e3f9ceb0a7436df812 mesa: 54ff536823bf5a431efe1f2becdb21174c146948 xserver: b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3 pixman: 978bab253d1d061b00b5e80aa45ab6986aac466f xkeyboard-config: 05dcc6db64cd7425aea6d22efd6a3ecf34dbddd2
* | Some minor changes to solve compilation problems after last mergemarha2012-12-032-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-2935-160/+573
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig xserver mesa git update 29 nov 2012 Conflicts: xorg-server/dix/dispatch.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwindow.h xorg-server/os/osinit.c xorg-server/os/utils.c
| * fontconfig xserver mesa git update 29 nov 2012marha2012-11-2935-109/+567
| | | | | | | | | | | | xserver: 1712a45422a63f11b2146541279616fcfda09ec6 fontconfig: faea1cac85ac3b0fd6a983e1c0adeb68e115e06c mesa: c1023608002c985b9d72edc64732cd666de2a206
* | Now the software can be compiled from inside a cygwin terminalmarha2012-11-202-0/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-192-10/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: git update 19 nov 2012 Added bash script to update released branch Conflicts: mesalib/src/mapi/glapi/gen/gl_API.xml mesalib/src/mesa/program/.gitignore pixman/pixman/pixman-mmx.c xorg-server/Xi/xiquerypointer.c xorg-server/xkb/xkb.c
| * git update 19 nov 2012marha2012-11-192-10/+25
| | | | | | | | | | | | | | | | | | fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7 xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
* | Merge remote-tracking branch 'origin/released'marha2012-11-1980-5448/+5448
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: Changed file permissions dos -> unix Conflicts: libX11/include/X11/Xregion.h libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/StrKeysym.c libX11/src/Window.c libX11/src/xkb/XKBBind.c libX11/src/xkb/XKBGetMap.c libX11/src/xkb/XKBSetGeom.c libX11/src/xkb/XKBUse.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libXdmcp/Key.c libXdmcp/Write.c libxcb/src/xcb_windefs.h xkbcomp/keycodes.c xkbcomp/xkbpath.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mln_s.sh xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
| * dos -> unixmarha2012-11-1980-5446/+5446
| |
* | Allow specifying a key file in putty format when starting a remote programmarha2012-11-096-15/+114
| | | | | | | | | | Now plink is a real console application in the release build (no -console option anymore)
* | Merge remote-tracking branch 'origin/released'marha2012-11-0715-85/+23
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 7 nov 2012 Conflicts: mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mesa/main/.gitignore xkbcomp/listing.c xorg-server/hw/xwin/winshaddd.c xorg-server/hw/xwin/winshadddnl.c
| * xserver mesa xkbcomp git update 7 nov 2012marha2012-11-0711-99/+15
| | | | | | | | | | | | xserver: 011f8458805e443ac9130865d2840a929a00cabf xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4 mesa: f42518962a08ce927e4ddd233d19d2661e135834
* | Merge remote-tracking branch 'origin/released'marha2012-11-074-1216/+2068
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 5 nov 2012 Conflicts: mesalib/src/glsl/.gitignore mesalib/src/mesa/main/.gitignore xorg-server/Xi/chgdctl.c xorg-server/dix/getevents.c xorg-server/hw/xwin/winprefs.c xorg-server/os/utils.c
| * xserver mesa xkbcomp git update 5 nov 2012marha2012-11-052-1/+3
| | | | | | | | | | | | xserver: a194630f7f7b287cb4ea4a459df0745f4c0d4c1a mesa: ccbfe3dde94cd50a4e6468cfeabf95c79c9d8072 xkbcomp: a68c5b7b29eb1433b1be73b50c4248e10eab8e64
* | Now create a seperate installer for the debug exe and dllsmarha2012-10-301-5/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-10-3029-649/+525
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig xserver mesa git update 30 oct 2012 Conflicts: xorg-server/dix/grabs.c xorg-server/hw/xwin/winclipboard.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winmsg.h xorg-server/hw/xwin/winprefslex.l xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winregistry.c
| * fontconfig xserver mesa git update 30 oct 2012marha2012-10-3029-654/+545
| | | | | | | | | | | | fontconfig: bdaef0b80dc27f4ab7a9d9bcedcfd8b5724b3cfd xserver: 1ca096d5e07221025c4c4110528772b7d94f15ee mesa: 0a66ced8f822b0d5478b0cd6d72c1a6ad70647a2
* | Increased version number to 1.13.0.01.13.0.0marha2012-10-221-1/+1
| | | | | | | | Added release not for 1.13.0.0
* | Merge remote-tracking branch 'origin/released'marha2012-10-153-2/+7
|\| | | | | | | | | | | | | | | * origin/released: xserver mesa pixman git update 15 oct 2012 Conflicts: xorg-server/hw/xwin/InitOutput.c
| * xserver mesa pixman git update 15 oct 2012marha2012-10-154-4/+10
| | | | | | | | | | | | xserver: a69429a17bf4630f6e26f61630a1c2b287202627 pixman: d5f2f39319fc358cccda60abe0bc927bd27131c1 mesa: 4004620d34a580c8fdb965d9b640e97453fc8b28
* | Merge remote-tracking branch 'origin/released'marha2012-10-093-1/+11
|\| | | | | | | | | * origin/released: fontconfig xserver mesa xkeyboard-config git update 9 oct 2012
| * fontconfig xserver mesa xkeyboard-config git update 9 oct 2012marha2012-10-093-1/+11
| | | | | | | | | | | | | | fontconfig: e7bfe729ab4cae63ca502291c1fe46cf7152b459 mesa: 63c3a799aecff5348ecec3c4c13355996e4bf820 xserver: 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf xkeyboard-config: 2e9ab8be72b1d0306e5e6e8c33cde51c0c927450