~gabriel1984sibiu/mediathekview1/mediathekview1-6

Viewing all changes in revision 159.

  • Committer: Markus Koschany
  • Date: 2014-04-16 09:02:38 UTC
  • mfrom: (1.2.3)
  • Revision ID: git-v1:5070e38dcb5e26d0aa7ef0227d7acce3d612ec68
Merge tag 'upstream/6'

Upstream version 6

# gpg: Signature made Wed 16 Apr 2014 11:02:33 CEST using RSA key ID 513B51E4
# gpg: Good signature from "Markus Koschany <apo@gambaru.de>" [ultimate]
# gpg:                 aka "Markus Koschany <markus@koschany.net>" [ultimate]

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: