projects
/
tools
/
mic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6e6edc5
db17eb7
)
Merge remote branch 'origin/master'
author
JF Ding
<jian-feng.ding@intel.com>
Mon, 19 Dec 2011 01:56:20 +0000
(09:56 +0800)
committer
JF Ding
<jian-feng.ding@intel.com>
Mon, 19 Dec 2011 01:56:20 +0000
(09:56 +0800)
1
2
mic/conf.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
mic/conf.py
Simple merge