Changeset db71e2a in mainline for uspace/app/bdsh/cmds/modules/modules.h

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• uspace/app/bdsh/cmds/modules/modules.h (modified) (2 diffs)

uspace/app/bdsh/cmds/modules/modules.h

@@ -50 +50 @@
 #include "mkfile/entry.h"
 #include "rm/entry.h"
-#include "bdd/entry.h"
 #include "cat/entry.h"
 #include "touch/entry.h"
@@ -74 +73 @@
 #include "mkfile/mkfile_def.h"
 #include "rm/rm_def.h"
-#include "bdd/bdd_def.h"
 #include "cat/cat_def.h"
 #include "touch/touch_def.h"