Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

0c5a1dfb

Commit 0c5a1dfb authored 15 years ago by Alexandre Savard

Downloads
- Patches
- Plain Diff

[#2165] Fix several merge problems

parent a5bde305

No related branches found

No related tags found

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/pixmaps/Makefile.am 1 addition, 51 deletions

sflphone-client-gnome/pixmaps/Makefile.am
sflphone-client-gnome/src/Makefile.am 1 addition, 1 deletion

sflphone-client-gnome/src/Makefile.am
sflphone-client-gnome/src/actions.c 4 additions, 4 deletions

sflphone-client-gnome/src/actions.c
sflphone-client-gnome/src/contacts/calltree.c 2 additions, 2 deletions

sflphone-client-gnome/src/contacts/calltree.c
sflphone-common/src/audio/audiortp/AudioRtpSession.h 4 additions, 2 deletions

sflphone-common/src/audio/audiortp/AudioRtpSession.h
sflphone-common/test/Makefile.am 2 additions, 0 deletions

sflphone-common/test/Makefile.am

with 14 additions and 60 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