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

888b16e9

Commit 888b16e9 authored 13 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

parents 2fac5754 4688ae2e

Branches

Tags

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

gnome/src/contacts/calltree.c 2 additions, 1 deletion

gnome/src/contacts/calltree.c
gnome/src/icons/icon_factory.c 4 additions, 11 deletions

gnome/src/icons/icon_factory.c
gnome/src/icons/icon_factory.h 4 additions, 14 deletions

gnome/src/icons/icon_factory.h
gnome/src/icons/pixmap_data.h 1 addition, 6 deletions

gnome/src/icons/pixmap_data.h
gnome/src/mainwindow.c 1 addition, 1 deletion

gnome/src/mainwindow.c
gnome/src/widget/imwidget.c 3 additions, 0 deletions

gnome/src/widget/imwidget.c

with 15 additions and 33 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