diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2013-08-11 02:35:58 +0400 |
|---|---|---|
| committer | Alexander Golubev <fatzer2@gmail.com> | 2013-08-11 02:35:58 +0400 |
| commit | b7ff6c33309224a4e598a0691e7cb2dc353a6ace (patch) | |
| tree | bc003a5aeba3b0980b5098985f6c28ba965b8b52 /tdeioslave/metainfo/metainfo.cpp | |
| parent | 34f10b970c1e644842ef737b5504591997e37d59 (diff) | |
| parent | 411486cc50448e91b53d28119ccec54c5c2305cd (diff) | |
| download | tdelibs-b7ff6c33309224a4e598a0691e7cb2dc353a6ace.tar.gz tdelibs-b7ff6c33309224a4e598a0691e7cb2dc353a6ace.zip | |
Merge branch 'master' into HEAD
Conflicts:
tdecore/CMakeLists.txt
tdecore/tdehardwaredevices.h
tdecore/tdehw/tdehardwaredevices.cpp
Diffstat (limited to 'tdeioslave/metainfo/metainfo.cpp')
| -rw-r--r-- | tdeioslave/metainfo/metainfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tdeioslave/metainfo/metainfo.cpp b/tdeioslave/metainfo/metainfo.cpp index 389a9182e..37f50a132 100644 --- a/tdeioslave/metainfo/metainfo.cpp +++ b/tdeioslave/metainfo/metainfo.cpp @@ -42,7 +42,7 @@ extern "C" int kdemain(int argc, char **argv) { - TDEApplication app(argc, argv, "tdeio_metainfo", false, true); + TDEApplication app(argc, argv, "tdeio_metainfo", false, true, false); if (argc != 4) { |