projects
/
tools
/
mic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
98cb89f
62322a8
)
Merge "conf.py: deal siteconf when set in init"
author
Qiang Zhang
<qiang.z.zhang@intel.com>
Fri, 16 Dec 2011 09:32:34 +0000
(17:32 +0800)
committer
Gerrit Code Review
<gerrit2@gerrit.bj.intel.com>
Fri, 16 Dec 2011 09:32:34 +0000
(17:32 +0800)
1
2
mic/conf.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
mic/conf.py
Simple merge