aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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-1518-79/+245
|\ | | | | | | | | * origin/released: libxcb mesa xserver xkeyboard-config git update 15 Feb 2013
| * libxcb mesa xserver xkeyboard-config git update 15 Feb 2013marha2013-02-1519-79/+249
| | | | | | | | | | | | | | 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
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-13342-7368/+10831
|\| | | | | | | | | | | | | | | * origin/released: Updated to latest CVS version of pthreads Conflicts: pthreads/Makefile
| * Updated to latest CVS version of pthreadsmarha2013-02-13340-7361/+10819
| |
* | Added NUL to ignoremarha2013-02-131-1/+2
| |
* | Freetype: solved compile problemsmarha2013-02-134-9/+9
| |
* | Make sure the script is run with bashmarha2013-02-131-0/+2
| |
* | Updated version of freetype in makefiles and project filesmarha2013-02-135-14/+14
| |
* | Removed executable bit from source filesmarha2013-02-1326-0/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-13356-3768/+11319
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: Update to following packages: Conflicts: freetype/src/autofit/afhints.c freetype/src/autofit/afmodule.c freetype/src/psaux/psconv.c freetype/src/sfnt/sfntpic.h openssl/Makefile openssl/util/pl/VC-32.pl
| * Update to following packages:marha2013-02-13357-3771/+11322
| | | | | | | | | | openssl-1.0.1e freetype-2.4.11
* | Increased version to 1.13.2.0marha2013-02-135-4/+964
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-1338-1111/+1838
|\| | | | | | | | | * origin/released: mesa pixman xserver git update 13 Feb 2013
| * mesa pixman xserver git update 13 Feb 2013marha2013-02-1338-1111/+1838
| | | | | | | | | | | | xserver commit 7115f6c709898a5124b67e19c61dc01334471358 pixman commit 5e207f825bd1ed3142a623bcbceca00508907c5e mesa commit 8cabe26f5dc4c66ae59649cfd7b25f761cda250b
* | Merge remote-tracking branch 'origin/released'marha2013-02-1125-228/+416
|\| | | | | | | | | * origin/released: xserver mesa git update 11 Feb 2013
| * xserver mesa git update 11 Feb 2013marha2013-02-1125-228/+416
| | | | | | | | | | xserver commit c1602d1c17967bdd4db9db19b3a9c0dfca6a58aa mesa commit 990bd49fba7d539e950bdda6eb9819a9abf14850
* | Merge remote-tracking branch 'origin/released'marha2013-02-086-63/+34
|\| | | | | | | | | | | | | | | * origin/released: fontconfig mesa git update 8 Feb 2013 Conflicts: updategit.sh
| * fontconfig mesa git update 8 Feb 2013marha2013-02-087-63/+58
| | | | | | | | | | fontconfig commit 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3 mesa commit b681ed6ac970e061e9dbe7309bb69b3a947ae62d
* | Synchronised filemarha2013-02-071-1/+31
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-0737-396/+1390
|\| | | | | | | | | * origin/released: mesa fontconfig git update 7 Feb 2013
| * mesa fontconfig git update 7 Feb 2013marha2013-02-0737-396/+1390
| | | | | | | | | | fontconfig commit 96220a5ed9d1d761b14a7ac516ac6786c132f280 mesa commit 9ba1e23647c09290c98cc7133fb73dd1df1da8ab
* | Added added source file to makefilemarha2013-02-051-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-0533-321/+815
|\| | | | | | | | | * origin/released: fontconfig mesa xkeyboard-config git update 5 feb 2013
| * fontconfig mesa xkeyboard-config git update 5 feb 2013marha2013-02-0533-321/+815
| | | | | | | | | | | | xkeyboard-config commit b4be67b48fb11989f1824dd0b1c8c399430162b0 fontconfig commit 95af7447dba7c54ed162b667c0bb2ea6500e8f32 mesa commit 86536a321d9d26137587affe687a07da71f0b526
* | Synchronised filemarha2013-02-011-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2013-02-0113-15/+98
|\| | | | | | | | | * origin/released: xkeyboard-config fontconfig mesa git update 1 feb 2013
| * xkeyboard-config fontconfig mesa git update 1 feb 2013marha2013-02-0113-15/+98
| | | | | | | | | | | | xkeyboard-config: 20191810d1fea7c2f49b65ffee3e4d5e2bc0bac3 fontconfig: 20191810d1fea7c2f49b65ffee3e4d5e2bc0bac3 mesa: b68a3b865be2dbd002f1fb8fc3eba20c4293a5bd
* | mhmake: solved file date checking on 64-bit windowsmarha2013-01-317-12/+50
| |
* | Synchronised filemarha2013-01-311-204/+205
| |
* | Synchronised filesmarha2013-01-313-1124/+1147
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-3149-13775/+21348
|\| | | | | | | | | * origin/released: libxtrans mesa pixman xkeyboard-config git update 31 jan 2013
| * libxtrans mesa pixman xkeyboard-config git update 31 jan 2013marha2013-01-3149-13775/+21348
| | | | | | | | | | | | | | libxtrans: bd53f4c8543faf910a7a151241ee07661b4d57ad mesa: a527b2192e3cb4a68af927ab405e38181d2fcf75 pixman: 958bd334b3c17f529c80f2eeef4224f45c62f292 xkeyboard-config: 46cfd7a3b5c6b6e00648407bd4c0dd56ae86d65a
* | mesa: added missing files to projectmarha2013-01-284-0/+20
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-28112-991/+5425
|\| | | | | | | | | * origin/released: mesa mkfontscale pixman git update 28 jan 2013
| * mesa mkfontscale pixman git update 28 jan 2013marha2013-01-28112-991/+5425
| | | | | | | | | | | | mesa: 87592cff57feef29565150b9203e220b50623f30 mkfontscale: b3af8de8d25128f565c2ed2f7c63b6e4099eb84e pixman: 65fc1adb6545737058e938105ae948a3607c277c
* | Merge remote-tracking branch 'origin/released'marha2013-01-2445-543/+1146
|\| | | | | | | | | | | | | | | * 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-2445-543/+1146
| | | | | | | | | | | | | | | | fontconfig: fb3b410998aba8835999e2ca7003a180431cfaf4 mesa: 5bd86b26df30d32412ca1b7ac02892ab5e10c6ef pixman: b527a0e615a726aa6a7d18f0ea0b38564b153afa xkbcomp: 705b9bbb426410f9510601c7010da51184919b36 xserver: 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee
* | Merge remote-tracking branch 'origin/released'marha2013-01-22131-2110/+1666
|\| | | | | | | | | | | | | | | | | | | | | * 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-22132-2107/+1664
| | | | | | | | | | | | | | | | | | | | fontconfig: 000ca9ccb03013a5b151f0d21148ab0ca4c2f2de libfontenc: f5d1208172e965fdd7fae8927bd3e29b3cc3a975 mesa: 148fc6d53716f39971a453792570c2b8c207efb6 mkfontscale: 547517571e695728278a264eedbac47b6e1f43bc pixman: 2c6577476e5b18e17904ae8af244a39c352e2e33 xserver: 70b127c9f1c53bdb42f078265e67f76b464deae2 xkeyboard-config: 6b35b1b43d2fdff30f530d7cf65fffd6c3504690
* | Merge remote-tracking branch 'origin/released'marha2013-01-1715-57/+102
|\| | | | | | | | | * origin/released: fontconfig libxcb mesa xkbcomp git update 17 jan 2013
| * fontconfig libxcb mesa xkbcomp git update 17 jan 2013marha2013-01-1716-59/+102
| | | | | | | | | | | | | | fontconfig: 671bcb34e23ed03b1f564af35560db81f8b12b96 libxcb: 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13 mesa: 56c01d81094795286828ecb83713e043695e905a xkbcomp: ed1b90216e59e6b3ac6ac5fd2faca8e056c76caa
* | xlaunch: Use dialog for prompting for password input instead of consolemarha2013-01-173-47/+103
| |
* | Added config file to bdftopcfmarha2013-01-161-0/+68
| |
* | Synchronised filesmarha2013-01-165-2231/+2258
| |
* | mesa: added formatquery.c to project filemarha2013-01-162-0/+4
| |
* | Fixed error introduced by mergemarha2013-01-161-2/+0
| |
* | xkeyboard-config: tuv was removedmarha2013-01-161-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-16190-7573/+34712
|\| | | | | | | | | | | | | * 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