projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74974d5 a8a9b12)
Merge branch 'master' into next
authorArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Thu, 5 Aug 2021 19:48:03 +0000 (21:48 +0200)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Thu, 5 Aug 2021 19:48:15 +0000 (21:48 +0200)
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
1  2 
DEVELOPERS patch | diff1 | diff2 | blob | history
package/usbguard/usbguard.mk patch | diff1 | diff2 | blob | history
package/wireshark/wireshark.mk patch | diff1 | diff2 | blob | history

diff --cc DEVELOPERS
Simple merge
diff --cc package/usbguard/usbguard.mk
Simple merge
diff --cc package/wireshark/wireshark.mk
Simple merge