Changeset 85f2064 in mainline for uspace/dist/data/web/foo.html

Timestamp:

2012-04-12T14:21:46Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bb8f69d

Parents:

751cabc (diff), d11a181 (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/dist/data/web/foo.html (moved) (moved from uspace/dist/data/web/foo.htm )