aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Solved some more problems due to latest mergemarha2013-01-075-1233/+1244
|
* Merge remote-tracking branch 'origin/released'marha2013-01-073-6/+62
|\ | | | | | | | | * origin/released: Switched to inputproto 2.2.99.1
| * Switched to inputproto 2.2.99.1marha2013-01-073-6/+62
| |
* | Solved compile problems in fontconfig introduced by latest mergemarha2013-01-076-5/+36
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-07250-3206/+5626
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-07248-3196/+5625
| | | | | | | | | | | | | | | | | | | | | | | | | | update 7 jan 2013 fontconfig: 17eda89ed2e24a3fc5f68538dd7fd9ada8efb087 xserver: bd91b05b631f13afd1f7a9d6cbc4f0c5408b523a xkeyboard-config: 4779e2745094ebe0c06364b4099d7067ae750d07 libX11: cd25cab4b5b957641183ce72dd1ae0424aff1663 libXau: e04364efccbb3bb4cfc5f4cb491ffa1faaaacbdb mesa: afec10df373f342f058aab66c622237964a4a147 pixman: 35cc965514ca6e665c18411fcf66db826d559c2a xkbcomp: e4f767913338052527538d429931e8abd8c3fb88
* | Solved unitialised warning messagemarha2012-12-181-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-12-1815-86/+163
|\| | | | | | | | | * origin/released: xserver mesa git update 18 oct 2012
| * xserver mesa git update 18 oct 2012marha2012-12-1815-86/+163
| | | | | | | | | | xserver: 3420a7778c7d5eaa638327f31dd460554c257bb1 mesa: dc613f11ddf1f3a6e10c2d99830fb1a84fdb55b2
* | Added lower_packed_varyings.cpp to mesa projectmarha2012-12-184-0/+8
| |
* | Synchronised makefile with configure.acmarha2012-12-181-60/+13
| |
* | Solved needless rebuildsmarha2012-12-181-0/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-12-1782-1377/+2154
|\| | | | | | | | | | | | | | | * origin/released: libXft pixman mesa git update 17 dec 2012 Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast.c
| * libXft pixman mesa git update 17 dec 2012marha2012-12-1782-1377/+2154
| | | | | | | | | | | | libXft: 835cd2a6cb4aa8f89e6e7dead66483643a6e7ee8 pixman: 526dc06e5694172abf979c03a5cf530207fe2d27 mesa: 1358f3a905448f6fb546aba951e317f743a83c76
* | Merge remote-tracking branch 'origin/released'marha2012-12-1214-33/+158
|\| | | | | | | | | * origin/released: fontconfig mesa pixman xkeyboard-config git update 12 dev 2012
| * fontconfig mesa pixman xkeyboard-config git update 12 dev 2012marha2012-12-1214-33/+158
| | | | | | | | | | | | | | fontconfig: 9ce36f4bbebc702a35d0cd9f1a59d5b828549bc6 mesa: 621259b3de1f15c879620bbf17764fd8a27ae6f5 pixman: fdab3c1b6cd9c5e197ec3f6bc0a03da32880e317 xkeyboard-config: 378597a9d525f069c049fdd6d04ff628123f82c7
* | Added missing files in mesa projectmarha2012-12-104-9/+14
| |
* | Merge remote-tracking branch 'origin/released'marha2012-12-10138-1766/+7086
|\| | | | | | | | | | | | | | | * origin/released: fontconfig libX11 mesa pixman git update 10 dec 2012 Conflicts: fontconfig/src/fcxml.c
| * fontconfig libX11 mesa pixman git update 10 dec 2012marha2012-12-10138-1766/+7086
| | | | | | | | | | | | | | libX11 9833489e6c3829a1e835bc0a11f028fc180809e4 mesa 17f5dc57306b8f5079304701e455bf4b927d3cae pixman 8ca4e144724ba2041bc5ef077ccf6d24e7cf4d1f fontconfig 608c5b590bd3428dfcd30f3d68ee8b7131e2f019
* | 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
| |
* | Also change the version number for the debug versionmarha2012-12-052-1/+2
| |
* | Updated version to 1.13.1.0marha2012-12-054-3/+932
| | | | | | | | Added release note
* | Merge remote-tracking branch 'origin/released'marha2012-12-0515-65/+79
|\| | | | | | | | | * origin/released: mesa git update 5 dec 2012
| * mesa git update 5 dec 2012marha2012-12-0515-65/+79
| | | | | | | | mesa: 484a8dcfa8c8b91b8e99174b5e4953264f32789e
* | When writing to stderr flush immediatelymarha2012-12-041-0/+1
| |
* | Solved runtime errors in debug versionmarha2012-12-041-4/+4
| |
* | Now you are able to enter the password when using a private key with amarha2012-12-041-154/+194
| | | | | | | | password
* | Added dependency on generator scriptsmarha2012-12-031-4/+4
| |
* | Synchronised filesmarha2012-12-032-1057/+1082
| |
* | Merge remote-tracking branch 'origin/released'marha2012-12-0386-683/+939
|\| | | | | | | | | * 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-0386-683/+939
| | | | | | | | | | | | | | | | fontconfig: 2442d611579bccb84f0c29e3f9ceb0a7436df812 mesa: 54ff536823bf5a431efe1f2becdb21174c146948 xserver: b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3 pixman: 978bab253d1d061b00b5e80aa45ab6986aac466f xkeyboard-config: 05dcc6db64cd7425aea6d22efd6a3ecf34dbddd2
* | Some minor changes to solve compilation problems after last mergemarha2012-12-033-1051/+1052
| |
* | Added missing filemarha2012-11-291-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-2967-363/+1688
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-2969-308/+1684
| | | | | | | | | | | | xserver: 1712a45422a63f11b2146541279616fcfda09ec6 fontconfig: faea1cac85ac3b0fd6a983e1c0adeb68e115e06c mesa: c1023608002c985b9d72edc64732cd666de2a206
* | Synchronised filemarha2012-11-211-1050/+1050
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-2114-138/+162
|\| | | | | | | | | * origin/released: Git update 21 nov 2012
| * Git update 21 nov 2012marha2012-11-2114-138/+162
| | | | | | | | | | | | fontconfig: 376fc9d22f1480ac380a3845f4cb4fe227e4be9a mesa: d82b873a501606d62b9f208b6d5cda79c9a6b4b8 xkeyboard-config: 0be23e0774bebdaa9766ddd7a1f3cf088d079bf0
* | Now the software can be compiled from inside a cygwin terminalmarha2012-11-2033-67/+234
| |
* | Solved compile problems due to latest mergemarha2012-11-207-22/+28
| |
* | Synchronised mesa filesmarha2012-11-2025-44638/+44656
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-19189-6431/+5945
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-19189-6429/+5942
| | | | | | | | | | | | | | | | | | fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7 xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
| * Added bash script to update released branchmarha2012-11-191-0/+68
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-191745-234613/+234616
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Changed file permissionsmarha2012-11-197-0/+0
| |
| * dos -> unixmarha2012-11-191745-234512/+234515
| |
* | Synchronised filesmarha2012-11-092-10/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-0941-76/+305
|\| | | | | | | | | * origin/released: mesa git update 9 nov 2012