Commit 52909485 authored by Feng Xiao's avatar Feng Xiao
Browse files

Merge branch v3.0.0-alpha-1 into master. 

Conflicts:
	configure.ac
parents 261fe97a 8d5d7cc6
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment