diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-11-11 12:55:11 +0100 |
|---|---|---|
| committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-11-11 12:55:11 +0100 |
| commit | 73af3f742f2085a1a21616edc92347b105f48e92 (patch) | |
| tree | ecaddf5671562a295a8bdd8c7b4928489e825c5e /src | |
| parent | 5481d74daaf7b97898af7d97aca1239bdd380ff2 (diff) | |
| parent | d0c9ae776af81736a119de5172cc12336dfba96c (diff) | |
| download | ayatana-indicator-sound-73af3f742f2085a1a21616edc92347b105f48e92.tar.gz ayatana-indicator-sound-73af3f742f2085a1a21616edc92347b105f48e92.tar.bz2 ayatana-indicator-sound-73af3f742f2085a1a21616edc92347b105f48e92.zip | |
Fixed conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6c621ae..73a270c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -207,5 +207,4 @@ install( RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/ ) -# Disable integration tests -# add_subdirectory(gmenuharness) +add_subdirectory(gmenuharness) |