-
- Downloads
Merge branch 'master' into qt-client
Conflicts: src/managerimpl.cpp
Showing
- configure.ac 9 additions, 9 deletionsconfigure.ac
- debian/changelog 16 additions, 0 deletionsdebian/changelog
- debian/control.intrepid 1 addition, 1 deletiondebian/control.intrepid
- debian/control.jaunty 1 addition, 1 deletiondebian/control.jaunty
- debian/rules 3 additions, 3 deletionsdebian/rules
- libs/dbus-c++/INSTALL 27 additions, 26 deletionslibs/dbus-c++/INSTALL
- libs/dbus-c++/depcomp 76 additions, 17 deletionslibs/dbus-c++/depcomp
- libs/dbus-c++/install-sh 355 additions, 159 deletionslibs/dbus-c++/install-sh
- libs/dbus-c++/missing 34 additions, 27 deletionslibs/dbus-c++/missing
- libs/libiax2/INSTALL 1 addition, 1 deletionlibs/libiax2/INSTALL
- po/fr.po 1 addition, 1 deletionpo/fr.po
- sflphone-gtk/.cproject 229 additions, 0 deletionssflphone-gtk/.cproject
- sflphone-gtk/.project 77 additions, 0 deletionssflphone-gtk/.project
- sflphone-gtk/.settings/org.eclipse.cdt.core.prefs 148 additions, 0 deletionssflphone-gtk/.settings/org.eclipse.cdt.core.prefs
- sflphone-gtk/.settings/org.eclipse.cdt.ui.prefs 4 additions, 0 deletionssflphone-gtk/.settings/org.eclipse.cdt.ui.prefs
- sflphone-gtk/.settings/org.eclipse.ltk.core.refactoring.prefs 3 additions, 0 deletions...hone-gtk/.settings/org.eclipse.ltk.core.refactoring.prefs
- sflphone-gtk/configure.ac 4 additions, 4 deletionssflphone-gtk/configure.ac
- 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
Loading
Please register or sign in to comment