Changeset bc73be3 in mainline for uspace/app/barber/barber.c


Ignore:
Timestamp:
2019-06-27T08:51:20Z (7 years ago)
Author:
Jaroslav Jindrak <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8add15e0
Parents:
ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/barber/barber.c

    rad40b74b rbc73be3  
    4545#include <window.h>
    4646#include <canvas.h>
    47 #include <surface.h>
    48 #include <codec/tga.gz.h>
     47#include <draw/surface.h>
     48#include <draw/codec.h>
    4949#include "images.h"
    5050
Note: See TracChangeset for help on using the changeset viewer.