witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

fix(CMakeLists.txt): fix bad cherry-pick

Browse source
This commit is contained in:
Ronan Abhamon 2017-08-30 10:36:36 +02:00
parent 0babed04f4
commit 858c06056e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/CMakeLists.txt
View file

@ -24,6 +24,8 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
c-wrapper/api/c-event-log.h
c-wrapper/c-tools.h
c-wrapper/c-types.h
chat/chat-room-p.h
chat/chat-room.h
content/content.h
core/core.h
cpim/cpim.h
@ -55,11 +57,8 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
object/object-p.h
object/object.h
object/singleton.h
<<<<<<< HEAD
utils/enum-generator.h
=======
utils/content-type.h
>>>>>>> b7c744ef8... Use ChatRoom C++ class.
utils/enum-generator.h
utils/general.h
utils/magic-macros.h
utils/utils.h
@ -67,6 +66,7 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
c-wrapper/api/c-event-log.cpp
chat/chat-room.cpp
content/content.cpp
core/core.cpp
cpim/header/cpim-core-headers.cpp