Ignore:
Timestamp:
2015-04-23T23:47:40Z (9 years ago)
Author:
Michal Koutný <xm.koutny+hos@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a18a8b9
Parents:
acb8766e (diff), dcba819 (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:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/audio/hound/audio_device.c

    racb8766e r055a68a  
    279279                        getuptime(&time2);
    280280                        log_verbose("Time to mix sources: %li\n",
    281                             tv_sub(&time2, &time1));
     281                            tv_sub_diff(&time2, &time1));
    282282                        break;
    283283                }
Note: See TracChangeset for help on using the changeset viewer.