chiark / gitweb /
Merge branch 'master' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Sat, 26 Nov 2016 08:02:42 +0000 (08:02 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Sat, 26 Nov 2016 08:02:42 +0000 (08:02 +0000)
commita5cc4d74fcdbc38f2700be0bfbf03fd95fc69c68
treee2edfd120d4ffde5c250416ae57bf48250eff0c5
parentd7ec32119853885c1284ea53d92cc1c69dfc7934
parentddefec33cdeafeee5db41cef965fa568a1d9fb11
Merge branch 'master' into 'master'

Add ndk 13b

See merge request !190