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

0a39c59f

Commit 0a39c59f authored Apr 17, 2009 by Alexandre Savard

Downloads
- Plain Diff

Merge commit 'origin/master' into m_savard

Conflicts:

	sflphone-gtk/src/actions.c
	sflphone-gtk/src/codeclist.c
	sflphone-gtk/src/config/audioconf.c

parents 305af596 a04d9867

No related branches found

No related tags found

No related merge requests found

Changes 37

Show whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
sflphone-gtk/.cproject 3 additions, 1 deletion

sflphone-gtk/.cproject
sflphone-gtk/Makefile.am 4 additions, 1 deletion

sflphone-gtk/Makefile.am
sflphone-gtk/configure.ac 5 additions, 0 deletions

sflphone-gtk/configure.ac
sflphone-gtk/globals.mak 1 addition, 0 deletions

sflphone-gtk/globals.mak
sflphone-gtk/log4crc 24 additions, 0 deletions

sflphone-gtk/log4crc
sflphone-gtk/src/Makefile.am 2 additions, 1 deletion

sflphone-gtk/src/Makefile.am
sflphone-gtk/src/accountlist.c 18 additions, 18 deletions

sflphone-gtk/src/accountlist.c
sflphone-gtk/src/actions.c 25 additions, 18 deletions

sflphone-gtk/src/actions.c
sflphone-gtk/src/assistant.c 56 additions, 56 deletions

sflphone-gtk/src/assistant.c
sflphone-gtk/src/call.c 5 additions, 5 deletions

sflphone-gtk/src/call.c
sflphone-gtk/src/codeclist.c 17 additions, 18 deletions

sflphone-gtk/src/codeclist.c
sflphone-gtk/src/config/addressbook-config.c 1 addition, 3 deletions

sflphone-gtk/src/config/addressbook-config.c
sflphone-gtk/src/config/audioconf.c 26 additions, 26 deletions

sflphone-gtk/src/config/audioconf.c
sflphone-gtk/src/config/configwindow.c 3 additions, 3 deletions

sflphone-gtk/src/config/configwindow.c
sflphone-gtk/src/contacts/addressbook.c 61 additions, 10 deletions

sflphone-gtk/src/contacts/addressbook.c
sflphone-gtk/src/contacts/addressbook.h 7 additions, 1 deletion

sflphone-gtk/src/contacts/addressbook.h
sflphone-gtk/src/contacts/addressbook/eds.c 137 additions, 35 deletions

sflphone-gtk/src/contacts/addressbook/eds.c
sflphone-gtk/src/contacts/addressbook/eds.h 25 additions, 2 deletions

sflphone-gtk/src/contacts/addressbook/eds.h
sflphone-gtk/src/contacts/calllist.c 5 additions, 5 deletions

sflphone-gtk/src/contacts/calllist.c

with 426 additions and 203 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