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

e26a2e55

Commit e26a2e55 authored 17 years ago by Pierre-Luc Beaudoin

Downloads
- Plain Diff

Merge commit 'origin/master'

parents 3231f100 20671d89

No related branches found

No related tags found

No related merge requests found

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 8 additions, 1 deletion

.gitignore
sflphone-gtk/src/calltree.c 367 additions, 347 deletions

sflphone-gtk/src/calltree.c
sflphone-gtk/src/configurationmanager-glue.h 14 additions, 14 deletions

sflphone-gtk/src/configurationmanager-glue.h
sflphone-gtk/src/configwindow.c 139 additions, 113 deletions

sflphone-gtk/src/configwindow.c
sflphone-gtk/src/dbus.c 19 additions, 0 deletions

sflphone-gtk/src/dbus.c
sflphone-gtk/src/dbus.h 1 addition, 0 deletions

sflphone-gtk/src/dbus.h
src/dbus/configurationmanager-glue.h 14 additions, 14 deletions

src/dbus/configurationmanager-glue.h
src/dbus/configurationmanager-introspec.xml 3 additions, 3 deletions

src/dbus/configurationmanager-introspec.xml
src/dbus/configurationmanager.cpp 45 additions, 40 deletions

src/dbus/configurationmanager.cpp
src/dbus/configurationmanager.h 2 additions, 2 deletions

src/dbus/configurationmanager.h
src/managerimpl.cpp 10 additions, 0 deletions

src/managerimpl.cpp
src/managerimpl.h 6 additions, 0 deletions

src/managerimpl.h

with 628 additions and 534 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