summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorFabian Schillinger2010-11-05 02:10:04 +0100
committerFabian Schillinger2010-11-05 02:10:04 +0100
commitc850c907ff61bf4798bdb4fa59f4679f9ba1287a (patch)
tree61aa14589cbec54eaf14b4b9f8e9100da28af9e8 /CMakeLists.txt
parentProcess start/stop/view functionality (diff)
parentMerge remote branch 'origin/master' (diff)
downloadpvs-c850c907ff61bf4798bdb4fa59f4679f9ba1287a.tar.gz
pvs-c850c907ff61bf4798bdb4fa59f4679f9ba1287a.tar.xz
pvs-c850c907ff61bf4798bdb4fa59f4679f9ba1287a.zip
Merge branch 'master' of openslx.org:pvs
Conflicts: src/gui/mainWindow.cpp
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 0 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34d1c97..dbbdeb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,13 +106,6 @@ SET( PVSMGR_SRCS
src/gui/processesStartDialog.cpp
src/gui/processWidget.cpp
src/gui/multicastConfigDialog.cpp
-
- # We need the following headers for translations.
- # They will not be compiled.
- src/input/killX11Handler.h
- src/input/rebootSystemHandler.h
- src/input/sayHelloHandler.h
- src/input/magicSysRqHandler.h
)
# pvs