chandrashekhar 821acf12d8 +Merge Adam Howard's (medavox) commit with my changes & remove conflict. ... +update searchEngine.java & YoutubeSearchEngine.java file. Conflicts: app/src/main/java/org/schabi/newpipe/SearchEngine.java app/src/main/java/org/schabi/newpipe/youtube/YoutubeSearchEngine.java		2015-11-05 13:03:47 +05:30
..
src	+Merge Adam Howard's (medavox) commit with my changes & remove conflict.	2015-11-05 13:03:47 +05:30
.gitignore	modified gitignore so jdk versions changes are hopefully not propagated to remote	2015-11-03 13:20:15 +00:00
app.iml	still fighting with jdk version strings in app/app.iml, .idea/gradle.xml, .idea/misc.xml	2015-11-03 13:19:23 +00:00
build.gradle	added ability to show similar videos	2015-11-02 19:57:47 +01:00
proguard-rules.pro	first commit	2015-09-04 02:15:03 +02:00