diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2018-07-16 00:56:11 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2018-07-16 00:56:11 +0000 |
| commit | d403624bf112a49991e903cfd236f0f1ff653cdf (patch) | |
| tree | 7c6b47be0bb4008461e4c836521e4d679a0bd40e /meson.build | |
| parent | 0814dec8b7765e472dca4e6d695f70c39976aec1 (diff) | |
| parent | bd06f7b94e563f276550cb81c3a0e5612c88c314 (diff) | |
| download | pango-wip/chergert/bidi-temp-allocs.tar.gz | |
Merge branch 'master' into 'wip/chergert/bidi-temp-allocs'wip/chergert/bidi-temp-allocs
# Conflicts:
# pango/pango-bidi-type.c
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index dc50240c..3733f246 100644 --- a/meson.build +++ b/meson.build @@ -510,8 +510,8 @@ configure_file(output: 'config.h', configuration: pango_conf) root_inc = include_directories('.') subdir('pango') +subdir('utils') subdir('examples') -subdir('pango-view') subdir('tests') subdir('tools') |