diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-21 15:16:58 +0200 |
|---|---|---|
| committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-21 15:16:58 +0200 |
| commit | 4dbdcf30a0ed10019d3350293c4ac52040393640 (patch) | |
| tree | fa01e697dee299506a91d1d9f41c2a61f429fcc9 /tests/service-mocks/CMakeLists.txt | |
| parent | 6ee23e401d3847e609f1ef50e1736f69e6253608 (diff) | |
| parent | 86c449a7125f3ff90dcac353c8a4ad5a8c2cc46e (diff) | |
| download | ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.tar.gz ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.tar.bz2 ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.zip | |
Fixed conflict. Updated changelog to be in sync with trunk
Diffstat (limited to 'tests/service-mocks/CMakeLists.txt')
| -rw-r--r-- | tests/service-mocks/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/service-mocks/CMakeLists.txt b/tests/service-mocks/CMakeLists.txt new file mode 100644 index 0000000..9cd8acb --- /dev/null +++ b/tests/service-mocks/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(accounts-mock) +add_subdirectory(media-player-mpris-mock) |