| commit | c12a85ccc891bd6f70f7ec64b6e6d2f5a8a8f7d9 | |
| author | Thomas Perl <m@thp.io> | |
| Fri, 8 Mar 2013 12:14:59 +0000 (8 13:14 +0100) | ||
| committer | Thomas Perl <m@thp.io> | |
| Fri, 8 Mar 2013 12:14:59 +0000 (8 13:14 +0100) | ||
| tree | c6da54d5c2fe35982d836bebf25b747d569d7047 | treesnapshot (tar.gz zip) |
| parent | 391ccc1db49473bf4856c64788792346a3fb1822 | commitdiff |
| parent | ef2d1746bcac5b274ad2e65adb9b9c7ffc7ac68c | commitdiff |
Merge commit 'gpodder-3.5.0' into harmattan
Conflicts:
bin/gpodder - master branch has Sailfish-related
changes, whereas the harmattan branch had some
improvements related to the "pause on call" bug.
Conflicts:
bin/gpodder - master branch has Sailfish-related
changes, whereas the harmattan branch had some
improvements related to the "pause on call" bug.
| bin/gpodder | diff1 | diff2 | blobhistory |
| setup.py | diff1 | diff2 | blobhistory |
| share/gpodder/ui/qml/main_default.qml | diff1 | diff2 | blobhistory |