aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-03-063-20/+40
|\ | | | | | | | | * origin/released: fontconfig libfontenc mesa xserver git update 6 Mar 2013
| * fontconfig libfontenc mesa xserver git update 6 Mar 2013marha2013-03-063-20/+40
| | | | | | | | | | | | | | xserver commit 103b77c59e3638a45179bf6d7908f5c738d2d872 libfontenc commit 624508365ec3279bc74ce523d024533e062629e1 fontconfig commit e96d7760886a3781a46b3271c76af99e15cb0146 mesa commit 88b20d58344ed336b146799c0bf1149a932dc2d7
* | Synchronised filesmarha2013-03-045-28758/+28880
| |
* | Merge remote-tracking branch 'origin/released'marha2013-03-048-13/+126
|\| | | | | | | | | | | | | | | | | * 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-048-13/+126
| | | | | | | | | | | | | | | | | | xserver commit 8f4640bdb9d3988148e09a08d2c7e3bab1d538d6 xkeyboard-config commit fa2f330df22511c3846cb1cb0760551c6e244a81 libX11 commit c23d61d1b84dca3740bf4786978c7908d0065fb9 pixman commit 5feda20fc39407879993ed4a6d861ef7f78d9432 fontconfig commit 612ee2a5c91b8929b2cc5abce4af84d8d7e66bd0 mesa commit e29124717eae4f8d329bb6a9707b802c0ff4bdd9
* | Merge remote-tracking branch 'origin/released'marha2013-02-272-6/+2
|\| | | | | | | | | * origin/released: libX11 mesa pixman xkeyboard-config
| * libX11 mesa pixman xkeyboard-configmarha2013-02-272-6/+2
| | | | | | | | | | | | | | xkeyboard-config commit 9993f996e75232385b19cc5078f7fecde6b399b9 libX11 commit b687440c28c7da6ee0ae44514d20248db5161606 pixman commit 2156fb51b353867d5a18b734690ca551f74d4fb1 mesa commit f987d23b28491bd7b0552bd9daffa53a8e073c71
* | Merge remote-tracking branch 'origin/released'marha2013-02-182-0/+84
|\| | | | | | | | | * origin/released: git update fontconfig libX11 mesa xkeyboard-config 18 Feb 2013
| * git update fontconfig libX11 mesa xkeyboard-config 18 Feb 2013marha2013-02-182-0/+84
| | | | | | | | | | | | | | xkeyboard-config commit 5102e074fea319c10243579955b64366f11009fd libX11 commit deedeada53676ee529d700bf96fde0b29a3a1def fontconfig commit 2c696255749683e9a084f797eb033d222510a275 mesa commit dd599188d2868838541859a76800a8420958d358
* | 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-156-5/+20
|\| | | | | | | | | * origin/released: libxcb mesa xserver xkeyboard-config git update 15 Feb 2013
| * libxcb mesa xserver xkeyboard-config git update 15 Feb 2013marha2013-02-157-5/+24
| | | | | | | | | | | | | | xserver commit 90642948cc78834d95f7a3bddaac7ff77b68ed7e libxcb commit 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13 xkeyboard-config commit 067b0e4fd8d4fe707d86b24ae83bcacb61624231 mesa commit 6dbe94c12cd1b3b912a7083055178e0dfd7372af
* | Make sure the fonts destination dir exists before copying the fonts.conf to it1.13.2.0marha2013-02-131-2/+2
| |
* | Updated version of freetype in makefiles and project filesmarha2013-02-131-2/+2
| |
* | Removed executable bit from source filesmarha2013-02-1314-0/+0
| |
* | Increased version to 1.13.2.0marha2013-02-133-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-134-17/+67
|\| | | | | | | | | * origin/released: mesa pixman xserver git update 13 Feb 2013
| * mesa pixman xserver git update 13 Feb 2013marha2013-02-134-17/+67
| | | | | | | | | | | | xserver commit 7115f6c709898a5124b67e19c61dc01334471358 pixman commit 5e207f825bd1ed3142a623bcbceca00508907c5e mesa commit 8cabe26f5dc4c66ae59649cfd7b25f761cda250b
* | Merge remote-tracking branch 'origin/released'marha2013-02-1119-218/+398
|\| | | | | | | | | * origin/released: xserver mesa git update 11 Feb 2013
| * xserver mesa git update 11 Feb 2013marha2013-02-1119-218/+398
| | | | | | | | | | xserver commit c1602d1c17967bdd4db9db19b3a9c0dfca6a58aa mesa commit 990bd49fba7d539e950bdda6eb9819a9abf14850
* | Merge remote-tracking branch 'origin/released'marha2013-02-051-1/+1
|\| | | | | | | | | * origin/released: fontconfig mesa xkeyboard-config git update 5 feb 2013
| * fontconfig mesa xkeyboard-config git update 5 feb 2013marha2013-02-051-1/+1
| | | | | | | | | | | | xkeyboard-config commit b4be67b48fb11989f1824dd0b1c8c399430162b0 fontconfig commit 95af7447dba7c54ed162b667c0bb2ea6500e8f32 mesa commit 86536a321d9d26137587affe687a07da71f0b526
* | Synchronised filemarha2013-02-011-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-011-5/+16
|\| | | | | | | | | * origin/released: xkeyboard-config fontconfig mesa git update 1 feb 2013
| * xkeyboard-config fontconfig mesa git update 1 feb 2013marha2013-02-011-5/+16
| | | | | | | | | | | | xkeyboard-config: 20191810d1fea7c2f49b65ffee3e4d5e2bc0bac3 fontconfig: 20191810d1fea7c2f49b65ffee3e4d5e2bc0bac3 mesa: b68a3b865be2dbd002f1fb8fc3eba20c4293a5bd
* | Synchronised filemarha2013-01-311-204/+205
| |
* | Synchronised filesmarha2013-01-313-1124/+1147
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-3116-12641/+18860
|\| | | | | | | | | * origin/released: libxtrans mesa pixman xkeyboard-config git update 31 jan 2013
| * libxtrans mesa pixman xkeyboard-config git update 31 jan 2013marha2013-01-3116-12641/+18860
| | | | | | | | | | | | | | libxtrans: bd53f4c8543faf910a7a151241ee07661b4d57ad mesa: a527b2192e3cb4a68af927ab405e38181d2fcf75 pixman: 958bd334b3c17f529c80f2eeef4224f45c62f292 xkeyboard-config: 46cfd7a3b5c6b6e00648407bd4c0dd56ae86d65a
* | Merge remote-tracking branch 'origin/released'marha2013-01-241-1/+1
|\| | | | | | | | | | | | | | | * origin/released: fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013 Conflicts: mesalib/src/glsl/.gitignore
| * fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013marha2013-01-241-1/+1
| | | | | | | | | | | | | | | | fontconfig: fb3b410998aba8835999e2ca7003a180431cfaf4 mesa: 5bd86b26df30d32412ca1b7ac02892ab5e10c6ef pixman: b527a0e615a726aa6a7d18f0ea0b38564b153afa xkbcomp: 705b9bbb426410f9510601c7010da51184919b36 xserver: 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee
* | Merge remote-tracking branch 'origin/released'marha2013-01-2229-199/+256
|\| | | | | | | | | | | | | | | | | | | | | * 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-2230-196/+254
| | | | | | | | | | | | | | | | | | | | 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
| |
* | Synchronised filesmarha2013-01-164-2230/+2256
| |
* | xkeyboard-config: tuv was removedmarha2013-01-161-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-1687-5985/+2553
|\| | | | | | | | | | | | | * origin/released: Switched to xcalc-1.0.5 Switched to bdftopcf-1.0.4 libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config
| * libxtrans fontconfig glproto libX11 libXau libXext libXft libXineramamarha2013-01-1687-5985/+2553
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libXmu libfontenc mesa xkeyboard-config libxtrans: d9f3728ff74ceb956f6cf8dc24b38611f9a4868a fontconfig: ec5ca08c807585a9230f83c95f7cca6b7065b142 glproto: 8e3407e02980d088e20041e79bdcdd3737e7827e libX11: f57fd760cba92ad846917f21e94e73e9c846185f libXau: 1a8a1b2c68967b48c07b56142799b1020f017027 libXext: 8eee1236041d46a21faba32e0d27c26985267d89 libXft: c5e760a239afc62a1c75e0509868e35957c8df52 libXinerama: 470b9356af961ff7d3968b164aa73872b49a5dcc libXmu: 474d22468c90f99104873b4c5fd7b0f0d2cbf823 libfontenc: 0c3518df24192f18f15ce91c2868560a5973a3dc mesa: 3c00a52f7e02007f40fa53a06fad517bed0328ff xkeyboard-config: 8a117fbd4a029b952afcfe362931628dccf496e4
* | Merge remote-tracking branch 'origin/released'marha2013-01-154-59/+88
|\| | | | | | | | | * origin/released: mesa fontconfig xkeyboard-config git update 15 jan 2013
| * mesa fontconfig xkeyboard-config git update 15 jan 2013marha2013-01-154-59/+88
| | | | | | | | | | | | mesa: 1c9833ba70466906d3d2ad3aee6a10642a39abdd fontconfig: 8b8f0d21534aa9b82276815c84429ffca8941d2a xkeyboard-config: 89f25045cb14ff9f08a047494a0d5966f2c1727d
* | Synchronised filesmarha2013-01-141-12/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-143-31/+24
|\| | | | | | | | | | | | | | | * origin/released: libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013 Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscalemarha2013-01-143-31/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | xkeyboard-config git update 14 jan 2013 libxtrans: ec3136232f7ce930f9ca812b6ab42a71b60af4af xwininfo: 3e60a26559221e561770710a8c4ed0b8ebc31afb libX11: 3cd974b1d4d1fa6389d3695fa9fcc0c22a51d50c libXau: 8570d287396934f26224c76d48d7f17d87380e72 libXmu: 9b253d99d5b4f3fbb681c2cb1b84f8f9acfee528 libXdmcp: ca65a92405500393f09d34388edbbf6350e6c146 mesa: e3e1ffb2520498584ef402213d0c8aa4303a46a3 mkfontscale: 1157b3039551b552b483f05f6a411e57941a87c0
* | Merge remote-tracking branch 'origin/released'marha2013-01-112-10/+17
|\| | | | | | | | | | | | | | | | | | | | | * 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-112-10/+17
| | | | | | | | | | | | | | | | fontconfig: 0831c1770e4bac7269a190936bbb0529d747e233 libX11: 0b148750027fd0557c5ed93afda861ddf4b92e0f mkfontscale: 9cbe3256bc932b82f2435b23cda0931f4f5f5ba2 xserver: 6703a7c7cf1a349c137e247a0c8eb462ff7b07be mesa: babab2876080af0fe65249dff559244aebd0b87e
* | Use fonts.conf file in fontconfigmarha2013-01-081-0/+7
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-081-0/+118
|\| | | | | | | | | | | | | | | * origin/released: fontconfig mesa git update 8 jan 2013 Conflicts: fontconfig/src/fccache.c
* | Solved some more problems due to latest mergemarha2013-01-073-1096/+1095
| |
* | Solved compile problems in fontconfig introduced by latest mergemarha2013-01-071-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-0799-974/+1940
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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