Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

17d87e4a

Commit 17d87e4a authored Apr 2, 2015 by Adrien Béraud

Downloads
- Patches
- Plain Diff

client: rename signal.h to avoid inclusion conflicts

Refs #70084

Change-Id: If635035aea8cd47c52396cdb62511b3507f428f8
(cherry picked from commit 9bfe1313)

parent 4e2e8cb7

No related branches found

No related tags found

No related merge requests found

Changes 23

Show whitespace changes

Inline Side-by-side

Showing

src/account.cpp 1 addition, 1 deletion

src/account.cpp
src/client/Makefile.am 2 additions, 2 deletions

src/client/Makefile.am
src/client/callmanager.cpp 1 addition, 1 deletion

src/client/callmanager.cpp
src/client/configurationmanager.cpp 1 addition, 1 deletion

src/client/configurationmanager.cpp
src/client/presencemanager.cpp 1 addition, 1 deletion

src/client/presencemanager.cpp
src/client/ring_signal.cpp 1 addition, 1 deletion

src/client/ring_signal.cpp
src/client/ring_signal.h 0 additions, 0 deletions

src/client/ring_signal.h
src/client/videomanager.cpp 1 addition, 1 deletion

src/client/videomanager.cpp
src/managerimpl.cpp 1 addition, 1 deletion

src/managerimpl.cpp
src/media/audio/alsa/alsalayer.cpp 1 addition, 1 deletion

src/media/audio/alsa/alsalayer.cpp
src/media/audio/sound/audiofile.cpp 1 addition, 1 deletion

src/media/audio/sound/audiofile.cpp
src/media/video/video_device_monitor.cpp 1 addition, 1 deletion

src/media/video/video_device_monitor.cpp
src/media/video/video_input.cpp 1 addition, 1 deletion

src/media/video/video_input.cpp
src/media/video/video_mixer.cpp 1 addition, 1 deletion

src/media/video/video_mixer.cpp
src/media/video/video_receive_thread.cpp 1 addition, 1 deletion

src/media/video/video_receive_thread.cpp
src/ringdht/ringaccount.cpp 1 addition, 1 deletion

src/ringdht/ringaccount.cpp
src/sip/pres_sub_client.cpp 1 addition, 1 deletion

src/sip/pres_sub_client.cpp
src/sip/pres_sub_server.cpp 1 addition, 1 deletion

src/sip/pres_sub_server.cpp
src/sip/sipaccount.cpp 1 addition, 1 deletion

src/sip/sipaccount.cpp
src/sip/sipaccountbase.cpp 1 addition, 1 deletion

src/sip/sipaccountbase.cpp

with 20 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment