projects
/
lede-git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5621a77
d4e7af5
)
Merge branch 'master' into ozonet
author
Alexandros Couloumbis
<alex@ozo.com>
Fri, 27 Oct 2017 07:24:15 +0000
(10:24 +0300)
committer
Alexandros Couloumbis
<alex@ozo.com>
Fri, 27 Oct 2017 07:24:15 +0000
(10:24 +0300)
1
2
target/linux/ar71xx/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
target/linux/ar71xx/base-files/etc/diag.sh
patch
|
diff1
|
diff2
|
blob
|
history
target/linux/ar71xx/base-files/lib/ar71xx.sh
patch
|
diff1
|
diff2
|
blob
|
history
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
target/linux/ar71xx/Makefile
Simple merge
diff --cc
target/linux/ar71xx/base-files/etc/diag.sh
Simple merge
diff --cc
target/linux/ar71xx/base-files/lib/ar71xx.sh
Simple merge
diff --cc
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
Simple merge