diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
| commit | 382067b05c4fe97bcf0da0143405375ec295f7c6 (patch) | |
| tree | f668cd2595ac0c85f0942f88729d3ff1956676fa /src/CMakeLists.txt | |
| parent | ee8191705826d978b7793497fdd307536c709bff (diff) | |
| parent | 9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff) | |
| download | plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2 plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 059eef64f..29e5afcb0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -335,8 +335,8 @@ SET(SRCS gui/windows/selldialog.h gui/windows/serverdialog.cpp gui/windows/serverdialog.h - gui/windows/setup.cpp - gui/windows/setup.h + gui/windows/setupwindow.cpp + gui/windows/setupwindow.h gui/widgets/tabs/setup_audio.cpp gui/widgets/tabs/setup_audio.h gui/widgets/tabs/setup_colors.cpp @@ -725,6 +725,7 @@ SET(SRCS being/playerinfo.h being/playerrelations.cpp being/playerrelations.h + being/playerrelationslistener.h position.cpp position.h properties.h |