diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2013-08-16 20:15:48 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2013-08-16 20:15:48 +0200 |
| commit | f6c5251b98b5ae1bc31a1d1940530174588c3e27 (patch) | |
| tree | ce31e7712455739b5e3149c2607b712763a375b2 /submodules | |
| parent | d94e2a7670f20b60ef42435753da118b364fdbab (diff) | |
| parent | 3994d02ddfb52a4418951a22bb72f55f85a76fbb (diff) | |
| download | AntennaPod-f6c5251b98b5ae1bc31a1d1940530174588c3e27.zip | |
Merge branch 'develop' into playback-speed
Conflicts:
pom.xml
src/de/danoeh/antennapod/service/PlaybackService.java
src/de/danoeh/antennapod/util/playback/PlaybackController.java
Diffstat (limited to 'submodules')
| m--------- | submodules/ActionBarSherlock | 0 | ||||
| m--------- | submodules/ViewPagerIndicator | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/submodules/ActionBarSherlock b/submodules/ActionBarSherlock deleted file mode 160000 -Subproject 9598f2bb2ceed4a834cd5586a903f270ca4c0cc diff --git a/submodules/ViewPagerIndicator b/submodules/ViewPagerIndicator deleted file mode 160000 -Subproject 8cd549f23f3d20ff920e19a2345c54983f65e26 |