Changeset c6588ce in mainline for uspace/dist/data/web/bar.html

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (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/bar.html (moved) (moved from uspace/dist/data/web/bar.htm )