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

Timestamp:

2020-07-03T23:00:34Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e79a025

Parents:

edb57bc6 (diff), 1a1c75e (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:

Resolve merge conflicts

File:

• uspace/srv/locsrv/locsrv.c (modified) (1 diff)

uspace/srv/locsrv/locsrv.c

@@ -1378 +1378 @@
         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);
+
+        cat = category_new("display-device");
         categ_dir_add_cat(&cdir, cat);