Changeset 58775d30 in mainline for uspace/app/barber/barber.c


Ignore:
Timestamp:
2015-03-16T16:07:21Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2003739
Parents:
6069061 (diff), 795e2bf (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:

Mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified uspace/app/barber/barber.c

    r6069061 r58775d30  
    233233        getuptime(&cur);
    234234       
    235         plan_frame_timer(tv_sub(&cur, &prev));
     235        plan_frame_timer(tv_sub_diff(&cur, &prev));
    236236}
    237237
     
    308308       
    309309        winreg = argv[1];
    310         window_t *main_window = window_open(argv[1], true, true, "barber");
     310        window_t *main_window = window_open(argv[1],
     311            WINDOW_MAIN | WINDOW_DECORATED, "barber");
    311312        if (!main_window) {
    312313                printf("Cannot open main window.\n");
Note: See TracChangeset for help on using the changeset viewer.