Skip to content
Snippets Groups Projects
Commit fbc64fe5 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge remote-tracking branch 'origin/master' into 1.6

Conflicts:
	src/rmean.cc
parents 619a0469 9086a8e3
No related branches found
No related tags found
No related merge requests found
Showing with 449 additions and 128 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment