← Back to branch summary

~ps-jenkins/mediascanner2/trusty-proposed

Viewing all changes in revision 212.

  • Committer: CI bot
  • Author(s): James Henstridge
  • Date: 2014-03-07 17:40:02 UTC
  • mfrom: (211.1.7 megamerge)
  • Revision ID: ps-jenkins@lists.canonical.com-20140307174002-udfe610ez85ixbik
Merge  lp:~jamesh/mediascanner2/qml-plugin,  lp:~jamesh/mediascanner2/short-searches,  lp:~jpakkane/mediascanner2/errmsg, lp:~jpakkane/mediascanner2/cleanshutdown,  lp:~jpakkane/mediascanner2/threadness and lp:~jamesh/mediascanner2/glib-main-loop 

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: