diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-07-31 13:10:17 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-07-31 13:10:17 -0700 |
| commit | 0d5ea40198f1503ae0ad243663d1c6ba2a4dca99 (patch) | |
| tree | 0e136575fdcb2d0b9b0f355861930acfd48a1d9c /app/src/main/res/drawable-hdpi/media_stop_dark.png | |
| parent | 67cd4eb3447794c94b96946e64d8e2720acbc51f (diff) | |
| parent | 9f597b5135b85b99755cd791e32796b89fbf81dd (diff) | |
| download | dsub-0d5ea40198f1503ae0ad243663d1c6ba2a4dca99.tar.gz dsub-0d5ea40198f1503ae0ad243663d1c6ba2a4dca99.tar.bz2 dsub-0d5ea40198f1503ae0ad243663d1c6ba2a4dca99.zip | |
Merge branch 'master' into SlideUpPanel2
Conflicts:
app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
app/src/main/res/values-de/strings.xml
Diffstat (limited to 'app/src/main/res/drawable-hdpi/media_stop_dark.png')
0 files changed, 0 insertions, 0 deletions