Skip to content
Snippets Groups Projects
Commit 6acf9783 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'master' of git+ssh://repos-sflphone-git@sflphone.org/~/sflphone 

Conflicts:

	libs/dbus-c++/INSTALL
	libs/dbus-c++/depcomp
	libs/dbus-c++/install-sh
parents 434251fc 261f5ba1
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 4861 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment