-
- Downloads
Merge branch 'master' into m_savard
Conflicts: sflphone-gtk/src/calltree.c
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- configure.ac 5 additions, 5 deletionsconfigure.ac
- libs/libiax2/iax2-config.in 3 additions, 3 deletionslibs/libiax2/iax2-config.in
- sflphone-gtk/pixmaps/Makefile.am 1 addition, 1 deletionsflphone-gtk/pixmaps/Makefile.am
- sflphone-gtk/pixmaps/wait-off.gif 0 additions, 0 deletionssflphone-gtk/pixmaps/wait-off.gif
- sflphone-gtk/pixmaps/wait-on.gif 0 additions, 0 deletionssflphone-gtk/pixmaps/wait-on.gif
- sflphone-gtk/src/actions.c 19 additions, 12 deletionssflphone-gtk/src/actions.c
- sflphone-gtk/src/calltab.h 1 addition, 1 deletionsflphone-gtk/src/calltab.h
- sflphone-gtk/src/calltree.c 118 additions, 115 deletionssflphone-gtk/src/calltree.c
- sflphone-gtk/src/contactlist/eds.c 66 additions, 5 deletionssflphone-gtk/src/contactlist/eds.c
- sflphone-gtk/src/contactlist/eds.h 4 additions, 2 deletionssflphone-gtk/src/contactlist/eds.h
- sflphone-gtk/src/dbus.c 1 addition, 1 deletionsflphone-gtk/src/dbus.c
- sflphone-gtk/src/historyfilter.c 0 additions, 89 deletionssflphone-gtk/src/historyfilter.c
- sflphone-gtk/src/historyfilter.h 0 additions, 31 deletionssflphone-gtk/src/historyfilter.h
- sflphone-gtk/src/mainwindow.c 1 addition, 1 deletionsflphone-gtk/src/mainwindow.c
- sflphone-gtk/src/menus.c 3 additions, 3 deletionssflphone-gtk/src/menus.c
- sflphone-gtk/src/searchfilter.c 34 additions, 8 deletionssflphone-gtk/src/searchfilter.c
- sflphone-gtk/src/searchfilter.h 14 additions, 4 deletionssflphone-gtk/src/searchfilter.h
- src/audio/audiortp.cpp 3 additions, 0 deletionssrc/audio/audiortp.cpp
- src/managerimpl.cpp 2 additions, 2 deletionssrc/managerimpl.cpp
Loading
Please register or sign in to comment