Merge pull request #529 from adrianschmutzler/openwrtversion

author Simon Wunderlich <sw@simonwunderlich.de>

Sun, 15 Dec 2019 15:00:16 +0000 (16:00 +0100)

committer GitHub <noreply@github.com>

Sun, 15 Dec 2019 15:00:16 +0000 (16:00 +0100)
author Simon Wunderlich <sw@simonwunderlich.de>
Sun, 15 Dec 2019 15:00:16 +0000 (16:00 +0100)
committer GitHub <noreply@github.com>
Sun, 15 Dec 2019 15:00:16 +0000 (16:00 +0100)
diff --cc alfred/Makefile
Simple merge
diff --cc batctl/Makefile
Simple merge
diff --cc batman-adv/Makefile
Simple merge
author	Simon Wunderlich <sw@simonwunderlich.de>
	Sun, 15 Dec 2019 15:00:16 +0000 (16:00 +0100)
committer	GitHub <noreply@github.com>
	Sun, 15 Dec 2019 15:00:16 +0000 (16:00 +0100)
		1	2
alfred/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
batctl/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
batman-adv/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history