Changeset 33c2952 in mainline for uspace/srv/locsrv/locsrv.c


Ignore:
Timestamp:
2012-11-07T21:00:02Z (14 years ago)
Author:
Adam Hraska <adam.hraska+hos@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
dcb0751
Parents:
fc89e32 (diff), 94795812 (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:

Merged with mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/locsrv/locsrv.c

    rfc89e32 r33c2952  
    13531353        categ_dir_add_cat(&cdir, cat);
    13541354
     1355        cat = category_new("clock");
     1356        categ_dir_add_cat(&cdir, cat);
     1357
    13551358        cat = category_new("test3");
    13561359        categ_dir_add_cat(&cdir, cat);
Note: See TracChangeset for help on using the changeset viewer.