Changeset 3deb0155 in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2013-04-10T19:11:45Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

dd0c8a0

Parents:

44186b01 (diff), b4f43a1 (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/hid/compositor/compositor.c (modified) (1 diff)

uspace/srv/hid/compositor/compositor.c

@@ -1962 +1962 @@
                 }
                 list_prepend(&blue_win->link, &window_list);
-
-                window_t *helenos_win = window_create(0, 0);
-                helenos_win->surface = decode_tga((void *) helenos_tga, helenos_tga_size, 0);
-                list_prepend(&helenos_win->link, &window_list);
-
+                
                 window_t *nameic_win = window_create(0, 0);
                 nameic_win->surface = decode_tga((void *) nameic_tga, nameic_tga_size, 0);