summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'limit-macos-ci' into 'master'Matthias Clasen2021-01-041-0/+3
|\
| * ci: Limit MacOS ci buildslimit-macos-ciMatthias Clasen2021-01-031-0/+3
|/
* Merge branch 'macos-ci' into 'master'Matthias Clasen2021-01-032-3/+30
|\
| * ci: Add cairo as a subprojectmacos-ciMatthias Clasen2021-01-031-0/+6
| * ci: Add a macos buildMatthias Clasen2021-01-031-3/+24
|/
* Merge branch 'glib2.62' into 'master'Matthias Clasen2020-11-201-1/+1
|\
| * Bump glib version to 2.62Xavier Claessens2020-11-191-1/+1
|/
* Merge branch 'wip/kalev/fix-installed-tests' into 'master'Matthias Clasen2020-11-102-0/+0
|\
| * tests: Add missing executable bits for helper scriptswip/kalev/fix-installed-testsKalev Lember2020-11-092-0/+0
|/
* 1.48.01.48.0Matthias Clasen2020-11-082-1/+9
* Add a release scriptMatthias Clasen2020-11-081-2/+2
* Merge branch 'shape-docs' into 'master'Matthias Clasen2020-11-082-6/+21
|\
| * Amend the shaping api docsshape-docsMatthias Clasen2020-11-071-4/+19
| * tests: Don't free attributes prematurelyMatthias Clasen2020-11-061-2/+2
|/
* Merge branch 'regular-face' into 'master'Matthias Clasen2020-11-061-8/+23
|\
| * fontconfig: Try harder to find a default faceregular-faceMatthias Clasen2020-11-061-8/+23
* | Merge branch 'test-shape-fix' into 'master'Matthias Clasen2020-11-061-1/+1
|\ \
| * | tests: Improve output of test-shapetest-shape-fixMatthias Clasen2020-11-061-1/+1
* | | Merge branch 'regular-face' into 'master'Matthias Clasen2020-11-051-3/+7
|\ \ \ | | |/ | |/|
| * | fontconfig: Try harder to return a default faceMatthias Clasen2020-11-051-3/+7
* | | Merge branch 'wip/issue510' into 'master'Matthias Clasen2020-11-052-2/+4
|\ \ \
| * | | ft2, xft: Write out the full type of the SubstituteFuncwip/issue510Simon McVittie2020-11-052-2/+4
|/ / /
* | | Merge branch 'override-dependency' into 'master'Matthias Clasen2020-10-144-5/+11
|\ \ \
| * | | ci: Update meson versionXavier Claessens2020-09-302-4/+5
| * | | meson: Use meson.override_dependency()Xavier Claessens2020-09-302-1/+6
* | | | Merge branch 'pango-fb' into 'master'Matthias Clasen2020-10-141-19/+39
|\ \ \ \
| * | | | meson: Fix cairo/fontconfig/freetype2 fallbackXavier Claessens2020-10-021-19/+39
| | |_|/ | |/| |
* | | | Merge branch 'four-but-only-once' into 'master'Matthias Clasen2020-10-031-1/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | tests: Don't add four.break twicefour-but-only-onceMatthias Clasen2020-10-021-1/+0
|/ /
* | Merge branch 'meson-freeetype2' into 'master'Matthias Clasen2020-09-301-11/+5
|\ \
| * | Meson: Use latest freetype2 subprojectXavier Claessens2020-09-291-11/+5
* | | Merge branch 'introspection2' into 'master'Matthias Clasen2020-09-303-4/+6
|\ \ \ | |_|/ |/| |
| * | meson: Change introspection option to yielding featureXavier Claessens2020-09-303-4/+6
|/ /
* | Revert "meson: Change introspection option to yielding feature"Matthias Clasen2020-09-303-6/+4
* | Merge branch 'ebassi/for-master' into 'master'Matthias Clasen2020-09-304-4/+7
|\ \
| * | build: Remove deprecated python3 Meson module useEmmanuele Bassi2020-09-303-3/+6
| * | Skip a pangofc accessorEmmanuele Bassi2020-09-301-1/+1
|/ /
* | Merge branch 'meson-cairo-fallback' into 'master'Nirbheek Chauhan2020-09-301-1/+1
|\ \
| * | meson: Fix cairo fallbackXavier Claessens2020-09-291-1/+1
| |/
* | Merge branch 'introspection' into 'master'Matthias Clasen2020-09-303-4/+6
|\ \
| * | meson: Change introspection option to yielding featureXavier Claessens2020-09-293-4/+6
| |/
* | 1.47.01.47.0Matthias Clasen2020-09-291-0/+6
* | Fix the release scriptMatthias Clasen2020-09-291-1/+1
|/
* Merge branch 'font-pattern-getter' into 'master'Matthias Clasen2020-09-214-0/+49
|\
| * fc: Add a getter for PangoFcFont::patternfont-pattern-getterMatthias Clasen2020-09-213-0/+21
| * fc: Sort faces of a familysort-facesMatthias Clasen2020-09-211-0/+28
|/
* Merge branch 'matthiasc/for-master' into 'master'Matthias Clasen2020-09-185-11/+11
|\
| * utils: Don't use deprecated apiMatthias Clasen2020-09-182-3/+3
| * Adapt deprecationsMatthias Clasen2020-09-183-8/+8
|/
* Merge branch 'ch/83' into 'master'Matthias Clasen2020-09-189-64/+118
|\