~siretart/gxine/trusty

Viewing all changes in revision 53.

  • Committer: Reinhard Tartler
  • Date: 2014-04-12 20:48:00 UTC
  • Revision ID: siretart@tauware.de-20140412204800-i55osx2zpn13h9ud
fixup merge conflict in src/player.c

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: