Changeset 70253688 in mainline for uspace/lib/gui/terminal.h

Timestamp:

2012-09-07T08:12:05Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e0c836e8

Parents:

131d9a4 (diff), 8cf4823 (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/lib/gui/terminal.h (modified) (2 diffs)

uspace/lib/gui/terminal.h

@@ -41 +41 @@
 #include <font.h>
 #include <io/chargrid.h>
+#include <io/con_srv.h>
 #include <adt/list.h>
 #include <adt/prodcons.h>
@@ -66 +67 @@
         
         service_id_t dsid;
+        con_srvs_t srvs;
 } terminal_t;