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

Timestamp:

2012-11-11T21:31:03Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

25eec4ef

Parents:

141a20d (diff), d1538a1 (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:

• uspace/srv/locsrv/locsrv.c (modified) (2 diffs)

uspace/srv/locsrv/locsrv.c

@@ -1353 +1353 @@
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("clock");
+        categ_dir_add_cat(&cdir, cat);
+
         cat = category_new("test3");
         categ_dir_add_cat(&cdir, cat);
@@ -1366 +1369 @@
         
         cat = category_new("nic");
+        categ_dir_add_cat(&cdir, cat);
+
+        cat = category_new("visualizer");
+        categ_dir_add_cat(&cdir, cat);
+
+        cat = category_new("renderer");
         categ_dir_add_cat(&cdir, cat);