Christian Schabesberger 466ba93750 Merge branch 'master' of github.com:theScrabi/NewPipe		2016-05-25 22:19:47 +02:00
..
src	Merge branch 'master' of github.com:theScrabi/NewPipe	2016-05-25 22:19:47 +02:00
.gitignore
build.gradle	Merge branch 'download-manager' of git://github.com/satiricon/NewPipe into satiricon-download-manager	2016-05-22 12:47:24 +02:00
proguard-rules.pro