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

Merge branch 'stable' into sip_dev 

Conflicts:

	.gitignore
	configure.ac
	src/Makefile.am
parents c2c032f6 1b59c10a
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 262 additions and 2278 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