Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
858c0605
Commit
858c0605
authored
Aug 30, 2017
by
Ronan
Browse files
fix(CMakeLists.txt): fix bad cherry-pick
parent
0babed04
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
src/CMakeLists.txt
src/CMakeLists.txt
+4
-4
No files found.
src/CMakeLists.txt
View file @
858c0605
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment