Changeset b412168 in mainline for uspace/app/init/init.c

Timestamp:

2014-11-17T03:25:04Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6069061

Parents:

ef3da5a (diff), 5042706 (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/app/init/init.c (modified) (1 diff)

uspace/app/init/init.c

@@ -355 +355 @@
         int rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);
         if (rc == EOK) {
+                gui_start("/app/barber", HID_COMPOSITOR_SERVER);
                 gui_start("/app/vlaunch", HID_COMPOSITOR_SERVER);
                 gui_start("/app/vterm", HID_COMPOSITOR_SERVER);