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 /Makefile.am | |
| 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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 3de1fadb..16d8c8d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,10 @@ ## Process this file with automake to create Makefile.in. -SUBDIRS= pango pango-view examples docs tools tests win32 +SUBDIRS= pango utils examples docs tools tests win32 meson_dist_files = \ pango/pango-features.h.meson \ - pango-view/meson.build \ + utils/meson.build \ meson.build \ meson_options.txt \ pango/meson.build \ |