Viewing all changes in revision 232.
- Committer: CI bot
- Date: 2014-05-30 07:28:56 UTC
- mfrom: (231.1.14 megamerge)
- Revision ID: ps-jenkins@lists.canonical.com-20140530072856-x3a6n2qrjxuj7c26
Merge lp:~jpakkane/mediascanner2/nomedia, lp:~jamesh/mediascanner2/mediafile-constructor, lp:~jpakkane/mediascanner2/clangfixes, lp:~jpakkane/mediascanner2/nullguard, lp:~jpakkane/mediascanner2/projectname, lp:~jpakkane/mediascanner2/pruneblocked, lp:~jamesh/mediascanner2/dbus-transport, lp:~jamesh/mediascanner2/dbus-apparmor, lp:~jamesh/mediascanner2/media-filter
- files added:
- src/mediascanner/Filter.cc
- src/ms-dbus
- test/noscan
- files removed:
- src/daemon/util.cc
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
