Changeset ca62f86 in mainline for uspace/srv/locsrv/locsrv.c


Ignore:
Timestamp:
2013-09-09T17:52:40Z (11 years ago)
Author:
Jakub Klama <jakub.klama@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f7bb6d1
Parents:
6ad185d (diff), a1ecb88 (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/locsrv/locsrv.c

    r6ad185d rca62f86  
    13771377        categ_dir_add_cat(&cdir, cat);
    13781378       
     1379        cat = category_new("audio-pcm");
     1380        categ_dir_add_cat(&cdir, cat);
     1381       
    13791382        return true;
    13801383}
Note: See TracChangeset for help on using the changeset viewer.