Christian Schabesberger 9484a5e2ee fix conflict		2018-04-14 11:02:31 +02:00
..
androidTest/java/org/schabi/newpipe	Code improvements	2017-06-28 18:56:05 +02:00
debug	Merge branch 'player_fix' of https://github.com/karyogamy/NewPipe into dev	2018-02-21 23:20:08 +01:00
main	fix conflict	2018-04-14 11:02:31 +02:00
test	-Added quadratic slider strategy implementation and tests.	2018-03-21 20:08:33 -07:00