projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d5eda75
0a564b2
)
Merge branch 'setlocalversion-speedup' into kbuild/rc-fixes
author
Michal Marek
<
[email protected]
>
Fri, 2 Jul 2010 09:56:52 +0000
(11:56 +0200)
committer
Michal Marek
<
[email protected]
>
Fri, 2 Jul 2010 09:56:52 +0000
(11:56 +0200)
Conflicts:
Makefile
1
2
Makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Makefile
Simple merge
projects / openwrt / staging / blogic.git / commitdiff