Changeset 7943c43 in mainline for uspace/dist/data/web/index.htm


Ignore:
Timestamp:
2012-01-16T22:45:38Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
32817cc, 3fe58d3c
Parents:
9117ef9b (diff), 3ea725e (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:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/dist/data/web/index.htm

    r9117ef9b r7943c43  
    77    <body>
    88        <h1>Hello from HelenOS!</h1>
     9        <img src="helenos.png" alt="" style="float: left; margin: 6px;">
    910        <p>
    1011            This web page is brought to you by courtesy of HelenOS web server
Note: See TracChangeset for help on using the changeset viewer.