Skip to content
Snippets Groups Projects
Commit 0f51bc8d authored by René Nussbaumer's avatar René Nussbaumer
Browse files

Merge branch 'devel-2.4' into devel-2.5 


Conflicts:
	configure.ac (trivial)

Signed-off-by: default avatarRené Nussbaumer <rn@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parents 3fc210de 7b790a6a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
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