Changeset ddb844e in mainline for uspace/lib/c/meson.build

Timestamp:

2020-07-03T23:00:34Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e79a025

Parents:

edb57bc6 (diff), 1a1c75e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve merge conflicts

File:

• uspace/lib/c/meson.build (modified) (1 diff)

uspace/lib/c/meson.build

@@ -131 +131 @@
         'generic/io/console.c',
         'generic/io/table.c',
-        'generic/io/visualizer.c',
-        'generic/io/window.c',
         'generic/iplink.c',
         'generic/iplink_srv.c',