projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 514211f f1b0a43)
Merge branch 'zcrypt' into features
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 25 Jun 2018 08:25:09 +0000 (10:25 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 25 Jun 2018 08:25:09 +0000 (10:25 +0200)
Add the zcrypt base patches into features using a tip branch for
parallel merging via multiple tress.


Trivial merge
John Crispins staging tree