summaryrefslogtreecommitdiffstats
path: root/kioslave
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-02 02:41:30 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-02 02:41:30 -0500
commitb18416de202eb23828270e2f3de0632ce83c0004 (patch)
treeaf29c166d4a57ed4007a25d3cf73f4aacf12b875 /kioslave
parentd36f60966edf14f1420b8226951f6f26cd48c731 (diff)
parent1aff95bf1ab5e1f6222b25a83c5bb573f5842f9b (diff)
downloadtdebase-b18416de202eb23828270e2f3de0632ce83c0004.tar.gz
tdebase-b18416de202eb23828270e2f3de0632ce83c0004.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kioslave')
-rw-r--r--kioslave/media/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/kioslave/media/CMakeLists.txt b/kioslave/media/CMakeLists.txt
index c8e43cb98..41821df59 100644
--- a/kioslave/media/CMakeLists.txt
+++ b/kioslave/media/CMakeLists.txt
@@ -17,7 +17,7 @@ add_subdirectory( kfile-plugin )
add_subdirectory( kcmodule )
add_subdirectory( mimetypes )
add_subdirectory( services )
-tde_conditional_add_subdirectory( WITH_HAL propsdlgplugin )
+add_subdirectory( propsdlgplugin )
include_directories(