Skip to content
Snippets Groups Projects
Commit 52b4cb21 authored by Jean-Marc Valin's avatar Jean-Marc Valin
Browse files

Merge commit 'greg/master' 

Conflicts:
	libcelt/celt.c
	libcelt/celt.h
parents 56522add 2dd3d325
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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