Commit 6b27cbe1 authored 14 years ago by Emmanuel Milou

Merge branch 'master' into gconf

Conflicts:
	sflphone-client-gnome/src/Makefile.am
	sflphone-client-gnome/src/mainwindow.c
	sflphone-client-gnome/src/statusicon.c
	sflphone-client-gnome/src/uimanager.c

parents 936d5ea9 0ddab496

Branches

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 11128 additions and 4560 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment