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

37e8f9f1

Commit 37e8f9f1 authored 15 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'master' into conference

parents 00de1821 0a931f99

Branches

Tags

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

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

sflphone-client-gnome/pixmaps/Makefile.am
sflphone-client-gnome/src/config/preferencesdialog.c 8 additions, 7 deletions

sflphone-client-gnome/src/config/preferencesdialog.c
sflphone-client-gnome/src/dbus/dbus.c 2 additions, 1 deletion

sflphone-client-gnome/src/dbus/dbus.c
sflphone-client-gnome/src/sflphone_const.h 1 addition, 0 deletions

sflphone-client-gnome/src/sflphone_const.h
sflphone-client-gnome/src/statusicon.c 30 additions, 22 deletions

sflphone-client-gnome/src/statusicon.c
sflphone-client-gnome/src/statusicon.h 5 additions, 0 deletions

sflphone-client-gnome/src/statusicon.h
sflphone-common/libs/pjproject/pjmedia/build/Makefile 1 addition, 1 deletion

sflphone-common/libs/pjproject/pjmedia/build/Makefile

with 48 additions and 31 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