# Conflicts: # app/src/main/java/org/schabi/newpipe/Themer.java # app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java # app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java # app/src/main/res/layout-v18/fragment_videoitem_detail.xml # app/src/main/res/layout/fragment_videoitem_detail.xml # app/src/main/res/xml/settings.xml |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||