summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'introspection' into 'master'cherry-pick-c64f4835Matthias Clasen2020-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
|\
| * add pango_fc_font_map_set_default_substituteCaleb Hearon2020-06-139-60/+104
| * single function type for FC substitute callbackCaleb Hearon2020-06-134-4/+14
* | Merge branch 'preferred-languages' into 'master'Matthias Clasen2020-09-189-6/+156
|\ \
| * | pangofc: Add pango_fc_font_get_languagespreferred-languagesMatthias Clasen2020-09-185-1/+95
| * | Add pango_language_get_preferredMatthias Clasen2020-09-183-4/+36
| * | Bump version to 1.47Matthias Clasen2020-09-181-1/+1
| * | Add 1.48 version macrosMatthias Clasen2020-09-181-0/+24
|/ /
* | 1.46.21.46.2Matthias Clasen2020-09-182-1/+12
* | Add a release scriptMatthias Clasen2020-09-181-0/+28
* | Merge branch 'fix-keycap-sequences' into 'master'Matthias Clasen2020-09-183-5/+38
|\ \
| * | Add a test for keycap sequencesfix-keycap-sequencesMatthias Clasen2020-09-172-0/+27
| * | Fix handling of keycap sequencesMatthias Clasen2020-09-171-5/+11
|/ /
* | Merge branch 'matthiasc/for-master' into 'master'Matthias Clasen2020-09-173-5/+7
|\ \
| * | Make test-layout work for generating data againMatthias Clasen2020-09-171-3/+8
| * | Fix a cast-align warningMatthias Clasen2020-09-171-1/+1
| * | Small const correctness fixMatthias Clasen2020-09-171-1/+1
* | | Merge branch 'optional-dependencies' into 'master'Matthias Clasen2020-09-172-10/+22
|\ \ \
| * | | Make dependencies to fontconfig and freetype optional and explicit.Niklas Guertler2020-09-142-10/+22
* | | | Merge branch 'fix-nested-attributes' into 'master'Matthias Clasen2020-09-172-11/+95
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix attr iterators with overlapping attributesfix-nested-attributesMatthias Clasen2020-09-172-11/+95
* | | Merge branch 'offsetfix' into 'master'Matthias Clasen2020-09-121-2/+6
|\ \ \
| * | | Let get_items_log_attrs take the start-of-text offset into accountStephan Bergmann2020-09-101-2/+6
| |/ /
* | | Merge branch 'asan-fixes' into 'master'Matthias Clasen2020-09-125-8/+31
|\ \ \
| * | | tests: Fix some more memory errorsasan-fixesMatthias Clasen2020-09-121-5/+15
| * | | tests: Fix memory leaksMatthias Clasen2020-09-123-3/+3
| * | | tests: Make test-layout work standaloneMatthias Clasen2020-09-121-0/+3
| * | | ci: Suppress lsan leak warnings from dependenciesMatthias Clasen2020-09-122-0/+10
* | | | Merge branch 'asan-ci' into 'master'Matthias Clasen2020-09-122-1/+31
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | ci: Let stages run in parallelasan-ciMatthias Clasen2020-09-121-0/+5
| * | ci: Add a test run under asanMatthias Clasen2020-09-121-1/+24
| * | ci: Add libasan and libubsan to the docker imageMatthias Clasen2020-09-121-0/+2
|/ /
* | Merge branch 'optional-dependencies' into 'master'Matthias Clasen2020-09-093-9/+21
|\ \