projects / tools / mic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a740a5e fd3be60)
Merge branch 'bootstrap' into devel
authorGui Chen <gui.chen@intel.com>
Tue, 28 Aug 2012 13:32:06 +0000 (21:32 +0800)
committerGui Chen <gui.chen@intel.com>
Tue, 28 Aug 2012 13:32:06 +0000 (21:32 +0800)
Conflicts:
mic/creator.py

Signed-off-by: Gui Chen <gui.chen@intel.com>

Trivial merge
Domain: SCM / Build;