← Back to branch summary

~phablet-team/mediaplayer-app/remove_powerd

Viewing all changes in revision 216.

  • Committer: Jim Hodapp
  • Date: 2014-04-28 18:13:12 UTC
  • Revision ID: jim.hodapp@canonical.com-20140428181312-1dnaw9jp67x3y5jp
Remove merge conflict with upstream

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: