projects
/
feed
/
packages.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2564e40
9d423ba
)
Merge https://github.com/openwrt/packages
1015/head
author
aTanW
<villy@sft.ru>
Sun, 28 Jun 2015 14:58:00 +0000
(17:58 +0300)
committer
aTanW
<villy@sft.ru>
Sun, 28 Jun 2015 14:58:00 +0000
(17:58 +0300)
Conflicts:
net/ipsec-tools/Makefile
1
2
net/ipsec-tools/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
net/ipsec-tools/Makefile
Simple merge