Changeset 3e828ea in mainline for uspace/lib/gui/label.c


Ignore:
Timestamp:
2019-09-23T12:49:29Z (6 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9be2358
Parents:
9259d20 (diff), 1a4ec93f (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.
git-author:
Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)
git-committer:
Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)
Message:

Merge changes from master, especially Meson build

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/gui/label.c

    r9259d20 r3e828ea  
    3535
    3636#include <str.h>
    37 #include <drawctx.h>
     37#include <draw/drawctx.h>
    3838#include <stdlib.h>
    39 #include <surface.h>
    40 #include <font/embedded.h>
     39#include <draw/surface.h>
     40#include <draw/font.h>
    4141#include <errno.h>
    4242#include "window.h"
Note: See TracChangeset for help on using the changeset viewer.