Ignore:
Timestamp:
2013-12-25T22:54:29Z (10 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b51cf2c
Parents:
f7a33de (diff), ac36aed (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

    rf7a33de r0c2d9bb  
    162162                }
    163163                audio_pcm_register_event_callback(dev->sess,
    164                     device_event_callback, dev);\
     164                    device_event_callback, dev);
    165165
    166166                /* Fill the buffer first. Fill the first two fragments,
Note: See TracChangeset for help on using the changeset viewer.