projects / feed / routing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 713ea82 8a66ed1)
Merge pull request #269 from ecsv/batadv-fixes
authorSimon Wunderlich <sw@simonwunderlich.de>
Fri, 3 Feb 2017 18:06:32 +0000 (19:06 +0100)
committerGitHub <noreply@github.com>
Fri, 3 Feb 2017 18:06:32 +0000 (19:06 +0100)
batman-adv: maint patch import + settings fixes

1  2 
batctl/Makefile patch | diff1 | diff2 | blob | history
batman-adv/Makefile patch | diff1 | diff2 | blob | history

diff --cc batctl/Makefile
Simple merge
diff --cc batman-adv/Makefile
Simple merge
Mirror of routing feed